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

author Brian Behlendorf <behlendorf1@llnl.gov>

Mon, 28 Jun 2010 17:36:19 +0000 (10:36 -0700)

committer Brian Behlendorf <behlendorf1@llnl.gov>

Mon, 28 Jun 2010 17:36:19 +0000 (10:36 -0700)
author Brian Behlendorf <behlendorf1@llnl.gov>
Mon, 28 Jun 2010 17:36:19 +0000 (10:36 -0700)
committer Brian Behlendorf <behlendorf1@llnl.gov>
Mon, 28 Jun 2010 17:36:19 +0000 (10:36 -0700)
diff --cc lib/libzpool/kernel.c
Simple merge
diff --cc module/zfs/dmu_objset.c
Simple merge
diff --cc module/zfs/zio.c
Simple merge
author	Brian Behlendorf <behlendorf1@llnl.gov>
	Mon, 28 Jun 2010 17:36:19 +0000 (10:36 -0700)
committer	Brian Behlendorf <behlendorf1@llnl.gov>
	Mon, 28 Jun 2010 17:36:19 +0000 (10:36 -0700)
		1	2
lib/libzpool/kernel.c	patch \|	diff1 \|	diff2 \|	blob \| history
module/zfs/dmu_objset.c	patch \|	diff1 \|	diff2 \|	blob \| history
module/zfs/zio.c	patch \|	diff1 \|	diff2 \|	blob \| history