merge mainline into newreloc

diff --cc grub-core/Makefile.core.def
index 8533d31319353f3948fe573307648cd7b64bcde6,5961e8697d46d798242db9cb011da37f44ebb49a..74fd1d3acb2864234647cd3145c7b81f07a8399b
--- 1/grub-core/Makefile.core.def
--- 2/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -166,8 -166,10 +166,9 @@@ kernel = 
    emu = kern/emu/mm.c;
    emu = kern/emu/time.c;
  
 -  extra_dist = kern/i386/loader.S;
    extra_dist = kern/i386/realmode.S;
    extra_dist = kern/i386/pc/lzma_decode.S;
+   extra_dist = kern/mips/cache_flush.S;
  };
  
  program = {