tree b55351243094158d8f7098e29fcd9ca79f55bb64
parent c45d1fc191bba333086f066247dd6096175db0da
parent a7fb71d1b2a992a0c4842f06e2b450889e2442ec
author Anthony Liguori <aliguori@us.ibm.com> 1309204748 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1309204748 -0500

Merge remote-tracking branch 'kraxel/usb.17' into staging