merge mainline into mips

diff --cc conf/i386-efi.rmk
Simple merge

diff --cc conf/x86_64-efi.rmk
Simple merge

diff --cc configure.ac
index fcf1f48cf3a802ef7085e96836714c9e705c77d3,b654adeed20f6972bb8a7d7e53296fda796a0b4f..20b27e8659d25ca0dc92d41c578bc4e3c2797cab
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -133,10 -120,9 +133,11 @@@ case "$platform" i
    qemu)               machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
    pc)         machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
    emu)                machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
 +  yeeloong)   machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 +  qemu-mips)  machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
  esac
  CFLAGS="$CFLAGS $machine_CFLAGS"
+ TARGET_ASFLAGS="$TARGET_ASFLAGS $machine_CFLAGS"
  TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
  
  AC_SUBST(host_cpu)

diff --cc po/POTFILES
Simple merge