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

Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch

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

06ba6dc528917369be02e214a64361a133c654da