Rebase to upstream snapshot.

- Fix PPC build error (#967862)
- Fix crash on net_bootp command (#960624)
- Reset colors on ppc when appropriate (#908519)
- Left align "Loading..." messages (#908492)
- Fix probing of SAS disks on PPC (#953954)
- Add support for UEFI OSes returned by os-prober
- Disable "video" mode on PPC for now (#973205)
- Make grub fit better into the boot sequence, visually (#966719)

0483-Initialize-grub_file_filters_-all-enabled.patch

@@ -0,0 +1,57 @@
+From 80528f8d6ff44a0e2cd043cd0ba11e06aac8aea2 Mon Sep 17 00:00:00 2001
+From: Gustavo Luiz Duarte <gustavold@linux.vnet.ibm.com>
+Date: Wed, 12 Jun 2013 23:25:30 -0500
+Subject: [PATCH 483/483] Initialize grub_file_filters_{all,enabled}
+
+Without this we see an error on ppc during startup:
+
+Elapsed time since release of system processors: 220520 mins 17 secs
+DEFAULT CATCH!, exception-handler=fff00300
+at   %SRR0: 0000000000010d1c   %SRR1: 0000000000003002
+Open Firmware exception handler entered from non-OF code
+ 
+Client's Fix Pt Regs:
+00 000000000000b3a4 0000000001a3ff00 0000000000000000 000000000021ac50
+04 000000000021a810 0000000000001240 00000000002195c0 000000000021ab30
+08 000000000002195e 0000000065313237 0000000000000000 0000000001a3ff50
+0c 0000000000000124 0000000000000000 0000000000000000 0000000000000000
+10 0000000000000000 0000000000000000 0000000000000000 0000000000000000
+14 0000000000c00000 0000000000000008 0000000000000000 0000000000000000
+18 0000000000000000 0000000000000000 000000000021ab40 000000000020f8be
+1c 000000000021aa40 000000000021ac50 0000000000000000 000000000021ac50
+
+Special Regs:
+%IV: 00000300     %CR: 40000044    %XER: 00000000  %DSISR: 40000000
+%SRR0: 0000000000010d1c   %SRR1: 0000000000003002
+%LR: 000000000000b3a4    %CTR: 000000000000b378
+%DAR: 000000006531323f
+Virtual PID = 0
+ofdbg
+0 > 
+
+This doesn't appear to be the root cause of the problem; these should be
+initalized by calls to grub_file_filter_register() called from various
+GRUB_MOD_INIT() functions.  Nevertheless, right now it fixes the symptom.
+
+---
+ grub-core/kern/file.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c
+index 6426668..f10d958 100644
+--- a/grub-core/kern/file.c
++++ b/grub-core/kern/file.c
+@@ -28,8 +28,8 @@
+ 
+ void (*EXPORT_VAR (grub_grubnet_fini)) (void);
+ 
+-grub_file_filter_t grub_file_filters_all[GRUB_FILE_FILTER_MAX];
+-grub_file_filter_t grub_file_filters_enabled[GRUB_FILE_FILTER_MAX];
++grub_file_filter_t grub_file_filters_all[GRUB_FILE_FILTER_MAX] = {NULL, NULL, NULL, NULL};
++grub_file_filter_t grub_file_filters_enabled[GRUB_FILE_FILTER_MAX] = {NULL, NULL, NULL, NULL};
+ 
+ /* Get the device part of the filename NAME. It is enclosed by parentheses.  */
+ char *
+-- 
+1.8.2.1
+

grub2.spec

@@ -536,6 +536,8 @@ Patch0479: 0479-Add-support-for-UEFI-operating-systems-returned-by-o.patch
 Patch0480: 0480-Disable-GRUB-video-support-for-IBM-power-machines.patch
 Patch0481: 0481-Revert-Add-bootpath-device-to-the-list-967862.patch
 Patch0482: 0482-Fix-net_bootp-cmd-crash-when-there-isn-t-network-car.patch
+Patch0483: 0483-Initialize-grub_file_filters_-all-enabled.patch
+
 BuildRequires:  flex bison binutils python
 BuildRequires:  ncurses-devel xz-devel
 BuildRequires:  freetype-devel libusb-devel