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

author Brian Behlendorf <behlendorf1@llnl.gov>

Wed, 16 Jun 2010 21:43:17 +0000 (14:43 -0700)

committer Brian Behlendorf <behlendorf1@llnl.gov>

Wed, 16 Jun 2010 21:43:17 +0000 (14:43 -0700)
author Brian Behlendorf <behlendorf1@llnl.gov>
Wed, 16 Jun 2010 21:43:17 +0000 (14:43 -0700)
committer Brian Behlendorf <behlendorf1@llnl.gov>
Wed, 16 Jun 2010 21:43:17 +0000 (14:43 -0700)
diff --cc module/zfs/dbuf.c
Simple merge
diff --cc module/zfs/dmu_objset.c
Simple merge
diff --cc module/zfs/dmu_send.c
Simple merge
author	Brian Behlendorf <behlendorf1@llnl.gov>
	Wed, 16 Jun 2010 21:43:17 +0000 (14:43 -0700)
committer	Brian Behlendorf <behlendorf1@llnl.gov>
	Wed, 16 Jun 2010 21:43:17 +0000 (14:43 -0700)
		1	2
module/zfs/dbuf.c	patch \|	diff1 \|	diff2 \|	blob \| history
module/zfs/dmu_objset.c	patch \|	diff1 \|	diff2 \|	blob \| history
module/zfs/dmu_send.c	patch \|	diff1 \|	diff2 \|	blob \| history