Merge remote-tracking branch 'kraxel/usb.19' into staging
commitb4dabf9587d8e1d5d5edc6d3326021e390b9a532
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 19 Jul 2011 13:03:20 +0000 (19 08:03 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 19 Jul 2011 13:03:20 +0000 (19 08:03 -0500)
treedbf92da444d562c69e9bca18af7c1543d7f3a2a0
parentde20fbcac9d71fc91635919bfbe0883a7df71887
parent3dc345d5874475a05794e7e1688f133b35384a9a
Merge remote-tracking branch 'kraxel/usb.19' into staging
hw/pci_ids.h