From: Manoel Rebelo Abranches <mrabran@br.ibm.com>
Date: Fri, 1 Apr 2011 07:45:37 +0000 (-0300)
Subject: Merge mainline.
X-Git-Tag: 2.00~1195^2~23^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50ee5d686d43af7294e487014e025cfeaa2e31ce;p=thirdparty%2Fgrub.git

Merge mainline.
---

50ee5d686d43af7294e487014e025cfeaa2e31ce
diff --cc grub-core/Makefile.core.def
index 3579dd350,7c26b37e9..339185765
--- a/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;
  };