Merge remote-tracking branch 'kraxel/usb.17' into staging
commit656acddb39ee924b843df7f57d4c1798e49be058
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 27 Jun 2011 19:59:08 +0000 (27 14:59 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 27 Jun 2011 19:59:08 +0000 (27 14:59 -0500)
treeb55351243094158d8f7098e29fcd9ca79f55bb64
parentc45d1fc191bba333086f066247dd6096175db0da
parenta7fb71d1b2a992a0c4842f06e2b450889e2442ec
Merge remote-tracking branch 'kraxel/usb.17' into staging
hw/usb-ccid.c