From: Peter Maydell Date: Thu, 13 Feb 2014 14:52:06 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~1071 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f673e70ccc668607620cd6d30fd0b9bc7a54151d;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream' into staging PReP machine and devices * Cleanups for Raven PCI host bridge * Removal of PReP machine and devices from qemu-system-ppcemb # gpg: Signature made Mon 10 Feb 2014 16:19:03 GMT using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber " # gpg: aka "Andreas Färber " * remotes/afaerber/tags/prep-for-upstream: prep: Drop from ppcemb-softmmu raven: Use constant PCI_NUM_PINS instead of 4 prep: Kill get_system_io() usage Signed-off-by: Peter Maydell --- f673e70ccc668607620cd6d30fd0b9bc7a54151d