Brian Behlendorf 93b00c558f Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch ... Conflicts: module/zfs/zfs_ioctl.c		2010-05-14 11:51:27 -07:00
..
avl	Move zfs_config.h include to command line -include	2010-03-22 16:48:16 -07:00
nvpair	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2010-04-29 12:32:40 -07:00
unicode	Move zfs_config.h include to command line -include	2010-03-22 16:48:16 -07:00
zcommon	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2010-04-29 10:42:47 -07:00
zfs	Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch	2010-05-14 11:51:27 -07:00
zpios	Use kobject_set_name() for increased portability.	2009-10-02 16:31:23 -07:00
.gitignore	Add .gitignore files to exclude build products	2010-01-08 11:35:17 -08:00
Makefile.in	Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch	2010-03-09 10:30:21 -08:00