From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 14 Jun 2010 22:36:59 +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~32^2^2^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=993fa8c15cfc7fa372dec85156232ed5d35566df;p=zfs

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

993fa8c15cfc7fa372dec85156232ed5d35566df