From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 2 Jul 2009 23:52:07 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
X-Git-Tag: zfs-0.4.5~59^2^2^2^2~2^2~2^2^2~8^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5a71d128d3869fdf775a3f277b374911a256745;p=zfs

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

Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/spa.c
---

a5a71d128d3869fdf775a3f277b374911a256745