merge trunk

This commit is contained in:
Colin Watson 2011-01-04 15:41:07 +00:00
commit 944404efb8
70 changed files with 5454 additions and 183 deletions

View file

@ -1008,6 +1008,19 @@ 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;