From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 28 May 2010 22:38:49 +0000 (-0700)
Subject: Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~34^2~1^2^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b0deba9fc9d30a97008bc772ad52be418af872d;p=zfs

Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
---

0b0deba9fc9d30a97008bc772ad52be418af872d