]> granicus.if.org Git - zfs/commitdiff
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 22:38:49 +0000 (15:38 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 22:38:49 +0000 (15:38 -0700)

Trivial merge