]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
projects / thirdparty / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbbd67f d0b2542)
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)
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>

Trivial merge
Mirror of https://git.qemu.org/git/qemu.git