Commit Graph

10 Commits

Author SHA1 Message Date
Brian Behlendorf 87313883ac Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-07 15:29:12 -08:00
Brian Behlendorf 12a4048370 Enable zfs_create_fs to operate without the VFS 2009-01-07 15:26:04 -08:00
Brian Behlendorf a6d6f31db6 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:09:08 -08:00
Brian Behlendorf d7d260b870 Removing branch to readd under new name 2008-12-22 12:05:11 -08:00
Brian Behlendorf 3533b7ec8c Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 11:58:27 -08:00
Brian Behlendorf 683dc8d98e Fix up headers 2008-12-22 11:54:35 -08:00
Brian Behlendorf 11e1ce8c2e Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 11:36:50 -08:00
Brian Behlendorf aca9d98817 Fix conflict 2008-12-11 11:34:16 -08:00
Brian Behlendorf 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00