Merge remote-tracking branch 'kraxel/usb.26' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 13:57:33 +0000 (08:57 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 13:57:33 +0000 (08:57 -0500)

Trivial merge