]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebffe2a 0d95952)
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 14 Oct 2011 15:44:52 +0000 (10:44 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 14 Oct 2011 15:44:52 +0000 (10:44 -0500)
1  2 
Makefile.objs patch | diff1 | diff2 | blob | history
Makefile.target patch | diff1 | diff2 | blob | history
hw/ide/core.c patch | diff1 | diff2 | blob | history

diff --cc Makefile.objs
Simple merge
diff --cc Makefile.target
Simple merge
diff --cc hw/ide/core.c
Simple merge
Qemu copy for testing