Merge Mainline.

diff --cc grub-core/Makefile.am
index d5cd25a701ee8acbabddc6d0cb6726deed7dd388,98e275f7e70c85a3170e5c23fcd93a3eb59919f3..a8862b30987f88b0f57c8a84ac53b83dd24ca6d4
--- 1/grub-core/Makefile.am
--- 2/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@@ -147,9 -164,13 +166,14 @@@ KERNEL_HEADER_FILES += $(top_srcdir)/in
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
  endif
  
+ if COND_mips_qemu_mips
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+ endif
+ 
  if COND_powerpc_ieee1275
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
 +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ofnet.h
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h

diff --cc grub-core/Makefile.core.def
Simple merge

diff --cc grub-core/commands/ls.c
Simple merge