From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 18 May 2010 22:00:12 +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~4^2~2^2^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c014d461795600f578669bc35fb04f920afb1b8;p=zfs

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

3c014d461795600f578669bc35fb04f920afb1b8