From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 29 Apr 2010 19:03:31 +0000 (-0700)
Subject: Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
X-Git-Tag: zfs-0.4.9~7^2^2^2^2~16^2~2^2^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ef793a6671cec3b1d1eb1346d0126886ab27566;p=zfs

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

5ef793a6671cec3b1d1eb1346d0126886ab27566