summaryrefslogtreecommitdiff
path: root/roms
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-03-13 13:19:46 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-03-13 13:19:46 +0000
commitbe86c53c058d75fc3938b1b54f363259f282b3d5 (patch)
tree44e5dd6dd04a7c2b7a2342aa01698dc91a1243f7 /roms
parentc8d146aecceb560664b112279ffddf6fe1db99db (diff)
parent295d51aa6a0d3b9a97200913f58a4d8b0c53ac42 (diff)
Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging
PowerPC queue for 2.0-rc0 * QEMUMachine include cleanup * SLOF update * XICS reset fix * sPAPR PCI host bridge refactorings # gpg: Signature made Thu 13 Mar 2014 02:50:51 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/ppc-for-2.0: spapr-pci: Convert fprintf() to error_report() spapr-pci: Convert to QOM realize xics-kvm: Fix reset function pseries: Update SLOF firmware image to qemu-slof-20140304 Move QEMUMachine typedef to qemu/typedefs.h Revert "KVM: Split QEMUMachine typedef into separate header" Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'roms')
m---------roms/SLOF0
1 files changed, 0 insertions, 0 deletions
diff --git a/roms/SLOF b/roms/SLOF
-Subproject e2e8ac901e617573ea383f9cffd136146d0675a
+Subproject af6b7bf5879b6cd6825de2a107cb0e3219fb1df