From: Peter Maydell Date: Mon, 7 Jul 2014 18:06:55 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-2.1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=128f0e66149afb2dfc325dfd183aac345f417763;p=qemu.git Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-2.1' into staging PowerPC Reference Platform (PReP) * Update OpenHack'Ware firmware to replace QEMU-side workarounds # gpg: Signature made Mon 07 Jul 2014 15:49:42 BST using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber " # gpg: aka "Andreas Färber " * remotes/afaerber/tags/prep-for-2.1: prep: Update ppc_rom.bin prep: Remove CPU reset entry point hack related to OpenHack'Ware prep: Remove PCI memory hack related to OpenHack'Ware Signed-off-by: Peter Maydell --- 128f0e66149afb2dfc325dfd183aac345f417763