]> granicus.if.org Git - zfs/commitdiff
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
authorBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 9 Dec 2008 00:24:27 +0000 (16:24 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 9 Dec 2008 00:24:27 +0000 (16:24 -0800)
1  2 
zfs/lib/libzpool/kernel.c

Simple merge