From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 28 May 2010 22:38:43 +0000 (-0700)
Subject: Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~34^2~1^2^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffaa6779952da46b977565b2854113da2ae59da6;p=zfs

Merge branch 'gcc-unused' into refs/top-bases/gcc-branch

Conflicts:
	module/zfs/dbuf.c
	module/zfs/dsl_dataset.c
---

ffaa6779952da46b977565b2854113da2ae59da6