Merge remote branch 'mst/for_anthony' into staging
commitb254b0d15d48efc3bd43ae535158ded3c1519257
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:21:29 +0000 (17 08:21 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:21:29 +0000 (17 08:21 -0600)
tree856460106817ca5ccbab285b474a52cdcac2a46e
parent36888c6335422f07bbc50bf3443a39f24b90c7c6
parent513691b7ff20262efe9aafb85c8dd4615588ad48
Merge remote branch 'mst/for_anthony' into staging
Makefile.objs
hw/pci.c
hw/virtio-net.c