Added by Anthony Liguori over 12 years ago
Merge remote-tracking branch 'pmaydell/omap-for-upstream' into staging