zfs/lib
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
..
libavl Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
libnvpair Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-11 11:20:30 -07:00
libspl Fix 'make dist' on powerpc64 by include an atomic.S place holder file. 2009-07-01 12:49:10 -07:00
libunicode Add unicode makefile references and support 2009-01-05 12:32:55 -08:00
libuutil Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-03-19 21:03:58 -07:00
libzfs Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-06 13:40:29 -07:00
libzpool Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-06 13:40:29 -07:00
Makefile.am Refresh context 2009-01-05 12:45:17 -08:00