Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 14:03:57 +0000 (09:03 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 14:03:57 +0000 (09:03 -0500)
1  2 
hw/mips_malta.c

diff --cc hw/mips_malta.c
Simple merge