Added by Anthony Liguori over 12 years ago
Merge remote-tracking branch 'kraxel/usb.32' into staging