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)
commitd8ac46d950451a722fd6b1d5d0768c72bee87d47
treec6eaff53ce4ba99ff8c93b71a8346db2c91b2f1d
parent9d0baba1104c51f5d95d632ff41406e5aca83216
parentc50a6def965d2e5144557af447825c9875f48a6f
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
hw/mips_malta.c