diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-13 20:09:11 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-13 20:09:11 +0000 |
| commit | 8bf0975902bb23aea98da91e3a102bae3e1d94a6 (patch) | |
| tree | 4a82586e36409a3ff10766d6ccd608d60bbbdcdf /include | |
| parent | bbbd67f0ccdba93702e58879997c1d2ca67311b1 (diff) | |
| parent | d0b25425749d5525b2ba6d9d966d8800a5643b35 (diff) | |
| download | qemu-8bf0975902bb23aea98da91e3a102bae3e1d94a6.zip qemu-8bf0975902bb23aea98da91e3a102bae3e1d94a6.tar.gz qemu-8bf0975902bb23aea98da91e3a102bae3e1d94a6.tar.bz2 | |
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>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions