Brian Behlendorf 95885a2f68 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch ... Conflicts: lib/libzpool/include/sys/zfs_context.h lib/libzpool/kernel.c		2010-05-27 13:35:09 -07:00
..
libavl	Add DEFAULT_INCLUDE to rules, adjust = to += accordingly	2008-12-16 08:58:41 -08:00
libefi	Fix duplicate uuid_t typedef.	2010-03-09 13:38:55 -08:00
libnvpair	Remove nvpair_alloc_system.c change in libspl topic branch.	2010-05-18 12:47:08 -07:00
libspl	Add missing CDDL headers.	2010-05-18 13:38:06 -07:00
libunicode	Add unicode makefile references and support	2009-01-05 12:32:55 -08:00
libuutil	Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch	2010-05-27 13:35:09 -07:00
libzfs	Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch	2010-05-23 09:45:42 -07:00
libzpool	Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch	2010-05-27 13:35:09 -07:00
Makefile.am	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2009-10-09 16:12:49 -07:00