From: Peter Maydell Date: Wed, 19 Mar 2014 19:05:13 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-2.0' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f71e769d0754dc9a593a9e17ec6693a261b29f82;p=qemu.git Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-2.0' into staging QOM CPUState refactorings / X86CPU * Fix pointer type mismatch # gpg: Signature made Wed 19 Mar 2014 18:51:47 GMT using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber " # gpg: aka "Andreas Färber " * remotes/afaerber/tags/qom-cpu-for-2.0: exec: Fix CPU rework fallout Signed-off-by: Peter Maydell --- f71e769d0754dc9a593a9e17ec6693a261b29f82