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

Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch

Conflicts:
	cmd/zdb/zdb_il.c
---

d8f9623833c18b16f9175e98f87eec114552b70f