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