]> granicus.if.org Git - zfs/commitdiff
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
authorBrian Behlendorf <behlendorf1@llnl.gov>
Sat, 12 Dec 2009 00:21:21 +0000 (16:21 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Sat, 12 Dec 2009 00:21:21 +0000 (16:21 -0800)

Trivial merge