Brian Behlendorf 8c67d72771 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk ... Conflicts: cmd/zpool/zpool_main.c cmd/zpool/zpool_vdev.c lib/libzfs/libzfs_dataset.c lib/libzfs/libzfs_import.c lib/libzfs/libzfs_mount.c lib/libzfs/libzfs_pool.c		2010-05-28 21:41:17 -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	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2010-05-28 15:46:10 -07:00
libunicode	Add unicode makefile references and support	2009-01-05 12:32:55 -08:00
libuutil	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2010-05-27 13:32:58 -07:00
libzfs	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2010-05-28 21:41:17 -07:00
libzpool	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2010-05-28 21:41:17 -07:00
Makefile.am	Add libefi library in to the build system.	2009-10-09 15:58:45 -07:00