]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'qemu-kvm/memory/core' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 22 Aug 2011 17:26:30 +0000 (12:26 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 22 Aug 2011 17:26:30 +0000 (12:26 -0500)

Trivial merge