Merge branch 'feature-branch' into refs/top-bases/zfs-branch

author Brian Behlendorf <behlendorf1@llnl.gov>

Thu, 27 May 2010 20:42:00 +0000 (13:42 -0700)

committer Brian Behlendorf <behlendorf1@llnl.gov>

Thu, 27 May 2010 20:42:00 +0000 (13:42 -0700)
author Brian Behlendorf <behlendorf1@llnl.gov>
Thu, 27 May 2010 20:42:00 +0000 (13:42 -0700)
committer Brian Behlendorf <behlendorf1@llnl.gov>
Thu, 27 May 2010 20:42:00 +0000 (13:42 -0700)
diff --cc cmd/ztest/ztest.c
Simple merge
diff --cc module/zfs/dmu_tx.c
Simple merge
diff --cc module/zfs/txg.c
Simple merge
author	Brian Behlendorf <behlendorf1@llnl.gov>
	Thu, 27 May 2010 20:42:00 +0000 (13:42 -0700)
committer	Brian Behlendorf <behlendorf1@llnl.gov>
	Thu, 27 May 2010 20:42:00 +0000 (13:42 -0700)
		1	2
cmd/ztest/ztest.c	patch \|	diff1 \|	diff2 \|	blob \| history
module/zfs/dmu_tx.c	patch \|	diff1 \|	diff2 \|	blob \| history
module/zfs/txg.c	patch \|	diff1 \|	diff2 \|	blob \| history