From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 13 Mar 2014 20:09:11 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-2.0' into staging
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8bf0975902bb23aea98da91e3a102bae3e1d94a6;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git

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

PReP machine and devices

* ppc_rom.bin update
* Raven PCI host bridge preparations for OpenBIOS

# gpg: Signature made Thu 13 Mar 2014 19:28:37 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-2.0:
  raven: Move BIOS loading from board code to PCI host
  prep: Update ppc_rom.bin

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

8bf0975902bb23aea98da91e3a102bae3e1d94a6