]> granicus.if.org Git - zfs/commitdiff
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 29 Apr 2010 19:31:59 +0000 (12:31 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 29 Apr 2010 19:31:59 +0000 (12:31 -0700)

Trivial merge