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

Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
---

06a45ce57eef3e356aba14b5c4a7fb17a3ea5641