]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'qemu-kvm/memory/mutators' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Dec 2011 15:12:25 +0000 (09:12 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Dec 2011 15:12:25 +0000 (09:12 -0600)
commitcde7fc31dee7a7bac96779f77a21825b187871d3
tree2be2b44d2a413f8af70e50a446bec77e3e701d0e
parent3cfdd0da7e513e740b759a2abec49db3c086d6e2
parenta6c5c07990059c94bf50b0422e953af1368353c0
Merge remote-tracking branch 'qemu-kvm/memory/mutators' into staging

Conflicts:
memory.h
hw/cirrus_vga.c
hw/piix_pci.c
memory.h