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

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

Conflicts:
	cmd/zpool/zpool_main.c
	cmd/ztest/ztest.c
---

97352d51036cd690df8cab91f68027f3f24bddf7