merge with mainline

diff --cc grub-core/conf/i386-pc.rmk
Simple merge

diff --cc grub-core/include/grub/ieee1275/ieee1275.h
Simple merge

diff --cc grub-core/include/grub/video.h
Simple merge

diff --cc grub-core/kern/ieee1275/cmain.c
Simple merge

diff --cc grub-core/kern/ieee1275/init.c
Simple merge

diff --cc grub-core/term/ieee1275/ofconsole.c
Simple merge

diff --cc grub-core/video/i386/pc/vga.c
index 0000000,222a712..222a712
mode 000000,100644..100644
--- /dev/null
--- 2/video/i386/pc/vga.c
+++ b/grub-core/video/i386/pc/vga.c

diff --cc grub-core/video/readers/jpeg.c
Simple merge