merge mainline into ZFS

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-12-04 00:40:20 +01:00
commit 78ab87f61d
29 changed files with 4816 additions and 7 deletions

View file

@ -70,6 +70,10 @@ library = {
common = grub-core/fs/ufs2.c;
common = grub-core/fs/ufs.c;
common = grub-core/fs/xfs.c;
common = grub-core/fs/zfs/zfs.c;
common = grub-core/fs/zfs/zfs_lzjb.c;
common = grub-core/fs/zfs/zfs_sha256.c;
common = grub-core/fs/zfs/zfs_fletcher.c;
common = grub-core/lib/arg.c;
common = grub-core/lib/crypto.c;
common = grub-core/lib/envblk.c;