]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cde7fc3 ce76b8a)
Merge remote-tracking branch 'qemu-kvm/memory/xen' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Dec 2011 15:45:12 +0000 (09:45 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Dec 2011 15:45:12 +0000 (09:45 -0600)
1  2 
memory.c patch | diff1 | diff2 | blob | history

diff --cc memory.c
Simple merge
Qemu copy for testing