From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 12 Mar 2014 17:53:37 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream' into staging
X-Git-Tag: v2.0.0-rc0~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=750036a848ea913ba6343718ffa70da98f7eef6b;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream' into staging

PReP machine and devices

* ppc_rom.bin update and submodule

# gpg: Signature made Wed 12 Mar 2014 17:32:40 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/prep-for-upstream:
  prep: Update ppc_rom.bin
  Add OpenHack'Ware submodule

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

750036a848ea913ba6343718ffa70da98f7eef6b