Merge remote-tracking branch 'qemu-kvm/memory/batch' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Dec 2011 14:43:38 +0000 (08:43 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Dec 2011 14:43:38 +0000 (08:43 -0600)
1  2 
hw/syborg_virtio.c

Simple merge