Brian Behlendorf 45a5551a0e Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch ... Conflicts: module/zfs/zfs_ioctl.c		2009-11-20 12:11:23 -08:00
..
avl	Update to use spl_module_{init,exit}() macro API.	2009-10-01 16:47:49 -07:00
nvpair	Update to use spl_module_{init,exit}() macro API.	2009-10-01 16:47:49 -07:00
unicode	Update to use spl_module_{init,exit}() macro API.	2009-10-01 16:47:49 -07:00
zcommon	Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch	2009-11-20 12:11:23 -08:00
zfs	Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch	2009-11-20 12:11:23 -08:00
zpios	Use kobject_set_name() for increased portability.	2009-10-02 16:31:23 -07:00
Makefile.in	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-07-01 11:11:27 -07:00