]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commit
Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-2.0' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 13 Mar 2014 20:09:11 +0000 (20:09 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 13 Mar 2014 20:09:11 +0000 (20:09 +0000)
commit8bf0975902bb23aea98da91e3a102bae3e1d94a6
tree4a82586e36409a3ff10766d6ccd608d60bbbdcdf
parentbbbd67f0ccdba93702e58879997c1d2ca67311b1
parentd0b25425749d5525b2ba6d9d966d8800a5643b35
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>