Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case

author Brian Behlendorf <behlendorf1@llnl.gov>

Thu, 15 Jan 2009 22:05:26 +0000 (14:05 -0800)

committer Brian Behlendorf <behlendorf1@llnl.gov>

Thu, 15 Jan 2009 22:05:26 +0000 (14:05 -0800)
author Brian Behlendorf <behlendorf1@llnl.gov>
Thu, 15 Jan 2009 22:05:26 +0000 (14:05 -0800)
committer Brian Behlendorf <behlendorf1@llnl.gov>
Thu, 15 Jan 2009 22:05:26 +0000 (14:05 -0800)
diff --cc lib/libzfs/libzfs_dataset.c
Simple merge
diff --cc module/zfs/spa.c
Simple merge
diff --cc module/zfs/vdev_label.c
Simple merge
author	Brian Behlendorf <behlendorf1@llnl.gov>
	Thu, 15 Jan 2009 22:05:26 +0000 (14:05 -0800)
committer	Brian Behlendorf <behlendorf1@llnl.gov>
	Thu, 15 Jan 2009 22:05:26 +0000 (14:05 -0800)
		1	2
lib/libzfs/libzfs_dataset.c	patch \|	diff1 \|	diff2 \|	blob \| history
module/zfs/spa.c	patch \|	diff1 \|	diff2 \|	blob \| history
module/zfs/vdev_label.c	patch \|	diff1 \|	diff2 \|	blob \| history