Anthony Liguori cde7fc31de Merge remote-tracking branch 'qemu-kvm/memory/mutators' into staging ...

Conflicts:
	memory.h

2011-12-19 09:12:25 -06:00

..

specs

…

blkverify.txt

…

bootindex.txt

…

ccid.txt

…

ich9-ehci-uhci.cfg

…

libcacard.txt

…

memory.txt

…

migration.txt

…

qapi-code-gen.txt

…

qdev-device-use.txt

…

tracing.txt

…

usb2.txt

…

writing-qmp-commands.txt

…