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