merge trunk

diff --cc config.h.in
Simple merge

diff --cc configure.ac
index b3b5652,e6d7265..5f7846d
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -933,16 -990,20 +1001,21 @@@ AM_CONDITIONAL([COND_HAVE_FONT_SOURCE]
  AM_CONDITIONAL([COND_GRUB_PE2ELF], [test x$TARGET_OBJ2ELF != x])
  AM_CONDITIONAL([COND_APPLE_CC], [test x$TARGET_APPLE_CC = x1])
  AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
 +AM_CONDITIONAL([COND_ENABLE_CACHE_STATS], [test x$DISK_CACHE_STATS = x1])
  
  AM_CONDITIONAL([COND_HAVE_ASM_USCORE], [test x$HAVE_ASM_USCORE = x1])
+ AM_CONDITIONAL([COND_CYGWIN], [test x$host_os = xcygwin])
  
  # Output files.
+ cpudir="${target_cpu}"
+ if test x${cpudir} = xmipsel; then
+   cpudir=mips;
+ fi
  grub_CHECK_LINK_DIR
  if test x"$link_dir" = xyes ; then
-   AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
+   AC_CONFIG_LINKS([include/grub/cpu:include/grub/$cpudir])
    if test "$platform" != emu ; then
-     AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
+     AC_CONFIG_LINKS([include/grub/machine:include/grub/$cpudir/$platform])
    fi
  else
    mkdir -p include/grub 2>/dev/null

diff --cc grub-core/Makefile.core.def
index 51ae522,0924602..de57d2f
--- 1/grub-core/Makefile.core.def
--- 2/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -1503,8 -1665,7 +1665,13 @@@ module = 
    enable = videomodules;
  };
  
+ module = {
+   name = time;
+   common = commands/time.c;
+ };
++
 +module = {
 +  name = cacheinfo;
 +  common = commands/cacheinfo.c;
 +  condition = COND_ENABLE_CACHE_STATS;
 +};

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

diff --cc grub-core/kern/disk.c
index 2d50ea6,5584030..f296b9d
--- 1/grub-core/kern/disk.c
--- 2/grub-core/kern/disk.c
+++ b/grub-core/kern/disk.c
@@@ -46,11 -46,7 +46,7 @@@ static struct grub_disk_cache grub_disk
  void (*grub_disk_firmware_fini) (void);
  int grub_disk_firmware_is_tainted;
  
- grub_err_t (* grub_disk_ata_pass_through) (grub_disk_t,
-           struct grub_disk_ata_pass_through_parms *);
- 
- 
 -#if 0
 +#if DISK_CACHE_STATS
  static unsigned long grub_disk_cache_hits;
  static unsigned long grub_disk_cache_misses;
  

diff --cc include/grub/disk.h
Simple merge