4 Commits

Author	SHA1	Message	Date
Brian Behlendorf	a6b1465e30	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl ... Conflicts: module/zfs/include/sys/zfs_fuid.h module/zfs/zfs_fuid.c module/zfs/zfs_ioctl.c module/zfs/zfs_vfsops.c module/zfs/zfs_znode.c	2009-07-06 15:16:54 -07:00
Brian Behlendorf	9babb37438	Rebase master to b117	2009-07-02 15:44:48 -07:00
Brian Behlendorf	86a5af4d25	Update HAVE_ZPL bits for zfs_ioctl	2009-01-09 11:13:22 -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