Merge branch 'master' into arm_coreboot

diff --cc grub-core/Makefile.core.def
index c1f367bd9563deaada35098330ff117f37e85a37,fb59a7b1d6a3730054b80aa59a60102f8159aa69..ba1178e6a742951d48e5d1d6870184bc30309bfc
--- 1/grub-core/Makefile.core.def
--- 2/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -154,18 -151,6 +154,21 @@@ kernel = 
    uboot = term/uboot/console.c;
    arm_uboot = kern/arm/uboot/init.c;
    arm_uboot = kern/arm/uboot/uboot.S;
++<<<<<<< HEAD
 +
 +  arm_coreboot = kern/arm/coreboot/init.c;
 +  arm_coreboot = kern/arm/coreboot/timer.c;
 +  arm_coreboot = kern/arm/coreboot/coreboot.S;
 +  arm_coreboot = lib/fdt.c;
 +  arm_coreboot = bus/fdt.c;
 +  arm_coreboot = term/ps2.c;
 +  arm_coreboot = term/arm/pl050.c;
 +  arm_coreboot = term/arm/cros.c;
 +  arm_coreboot = term/arm/cros_ec.c;
 +  arm_coreboot = commands/keylayouts.c;
 +  arm_coreboot = kern/arm/coreboot/dma.c;
++=======
++>>>>>>> master
  
    terminfoinkernel = term/terminfo.c;
    terminfoinkernel = term/tparm.c;

diff --cc grub-core/kern/arm/startup.S
Simple merge

diff --cc util/grub-mkimagexx.c
Simple merge