Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 20 Sep 2011 20:16:00 +0000 (15:16 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 20 Sep 2011 20:16:00 +0000 (15:16 -0500)
1  2 
hw/virtio.c
vl.c

diff --cc hw/virtio.c
Simple merge
diff --cc vl.c
Simple merge