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