Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
commit36f490b176afab3096e9c2877b365354f67e269d
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 14 Oct 2011 15:44:52 +0000 (14 10:44 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 14 Oct 2011 15:44:52 +0000 (14 10:44 -0500)
treeb99964fa0e30e9a7931c4944cd1897f8f735aee3
parentebffe2afceb1a17b5d134b5debf553955fe5ea1a
parent0d9595245393f6e59831447a06235a0a1b2cdfd4
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
Makefile.objs
Makefile.target
hw/ide/core.c