Merge remote-tracking branch 'origin/master' into staging

* origin/master: pc-bios: Update OpenBIOS images
2012-05-31 08:49:46 +08:00 · 2012-05-31 08:49:46 +08:00 · 272d28ecf2
parent d6111501c1 6f12926142
commit 272d28ecf2
5 changed files with 2 additions and 2 deletions
--- a/pc-bios/README
+++ b/pc-bios/README
@ -12,7 +12,7 @@
  1275-1994 (referred to as Open Firmware) compliant firmware.
  The included images for PowerPC (for 32 and 64 bit PPC CPUs),
  Sparc32 and Sparc64 are built from OpenBIOS SVN revision
-  1056.
+  1060.

 - SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware
  implementation for certain IBM POWER hardware.  The sources are at
--- a/pc-bios/openbios-ppc
+++ b/pc-bios/openbios-ppc
--- a/pc-bios/openbios-sparc32
+++ b/pc-bios/openbios-sparc32
--- a/pc-bios/openbios-sparc64
+++ b/pc-bios/openbios-sparc64
--- a/roms/openbios
+++ b/roms/openbios
@ -1 +1 @@
-Subproject commit ff61d973e5a4a68b29e485b3f88e6a2d1d96cf45
+Subproject commit d1d2787f87167edf487a60e61b9168514d5a7434