Added by Anthony Liguori over 12 years ago
Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging