Merge mainline.

diff --cc Makefile.util.def
Simple merge

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

diff --cc grub-core/Makefile.core.def
index 3579dd3508f705aa1f372fb8f21f6d72da06714f,7c26b37e94c965ce03eed8070790a4bf19325b71..339185765118a36f43501815c89abc031c15c8f0
--- 1/grub-core/Makefile.core.def
--- 2/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -1007,9 -1008,22 +1008,22 @@@ module = 
    common = fs/xfs.c;
  };
  
+ module = {
+   name = zfs;
+   common = fs/zfs/zfs.c;
+   common = fs/zfs/zfs_lzjb.c;
+   common = fs/zfs/zfs_sha256.c;
+   common = fs/zfs/zfs_fletcher.c;
+ };
+ 
+ module = {
+   name = zfsinfo;
+   common = fs/zfs/zfsinfo.c;
+ };
+ 
  module = {
    name = pxe;
 -  i386_pc = fs/i386/pc/pxe.c;
 +  i386_pc = net/i386/pc/pxe.c;
    enable = i386_pc;
  };
  

diff --cc grub-core/loader/i386/multiboot_mbi.c
Simple merge

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