Brian Behlendorf 5e8f78191e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem ... Conflicts: module/zfs/dmu_send.c module/zfs/spa_history.c module/zfs/txg.c module/zfs/zfs_ioctl.c		2010-05-28 21:31:31 -07:00
..
libavl	Add DEFAULT_INCLUDE to rules, adjust = to += accordingly	2008-12-16 08:58:41 -08:00
libefi	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-10-14 15:57:10 -07: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/zfs-branch' into zfs-branch	2010-05-28 15:46:10 -07:00
libzpool	Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem	2010-05-28 21:31:31 -07:00
Makefile.am	Add libefi library in to the build system.	2009-10-09 15:58:45 -07:00