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

Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas

Conflicts:
	lib/libzfs/libzfs_mount.c
---

3d7dbfd793f1fc2652cf4ee25cf5c182518f44cf