From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 18 May 2010 22:00:10 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
X-Git-Tag: zfs-0.4.9~7^2^2^2^2~4^2~2^2^2~9^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6daf3d3eda5bf73843b4aeb8fedf262bd226b8fa;p=zfs

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

6daf3d3eda5bf73843b4aeb8fedf262bd226b8fa