]> granicus.if.org Git - zfs/commitdiff
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 19:45:41 +0000 (12:45 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 19:45:41 +0000 (12:45 -0700)

Trivial merge