Merge remote-tracking branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:15:22 +0000 (17:15 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:15:22 +0000 (17:15 -0500)
commitd09609a68a66d7515b14bb4c5be7d4d434fb7d0c
tree146a7b6eebbee1367453fde501d4462ac6d9f8b4
parente9ce1c4e1105a3b7940429457563eb4f6be5754c
parent235a2bc0aaec807192a21f0c6655aa95aae542a3
Merge remote-tracking branch 'mst/for_anthony' into staging
hw/pci.c
hw/pci_host.h
hw/virtio-net.c
hw/virtio-pci.c
net.c