zfs/lib
Brian Behlendorf e27754d9e8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_sendrecv.c
	module/zfs/dmu_objset.c
	module/zfs/dnode.c
	module/zfs/dnode_sync.c
	module/zfs/dsl_dataset.c
	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/txg.h
	module/zfs/spa_history.c
2010-05-28 15:45:38 -07:00
..
libefi Remove pragmas from new libefi files. 2009-10-14 15:44:22 -07:00
libnvpair Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-05-28 15:34:57 -07:00
libuutil Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 13:32:58 -07:00
libzfs Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-05-28 15:45:38 -07:00
libzpool Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-05-28 15:45:38 -07:00