]> granicus.if.org Git - zfs/commitdiff
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
authorBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 May 2010 18:13:00 +0000 (11:13 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 May 2010 18:13:00 +0000 (11:13 -0700)

Trivial merge