zfs/module
Brian Behlendorf 149c4b2731 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	cmd/ztest/ztest.c
	lib/libzfs/libzfs_pool.c
	module/zcommon/zfs_namecheck.c
	module/zfs/dmu.c
	module/zfs/include/sys/dmu.h
	module/zfs/include/sys/zfs_fuid.h
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
	module/zfs/zfs_fuid.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_vfsops.c
	module/zfs/zfs_znode.c
2009-07-06 13:40:29 -07:00
..
avl Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 11:17:23 -07:00
nvpair Revert 'linux-have-xdr' topic branch patch. 2009-03-11 14:39:10 -07:00
unicode Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 14:10:39 -07:00
zcommon Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-06 13:40:29 -07:00
zfs Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-06 13:40:29 -07:00
zpios Use spl_device_* macro's for portability. 2009-03-17 16:27:57 -07:00
Makefile.in Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-01 11:09:33 -07:00