From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 3 Jul 2009 00:08:30 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
X-Git-Tag: zfs-0.4.5~59^2^2^2^2~2^2~2^2^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbaf4f6c0f55dd8c124b42af8a49369463cc97b7;p=zfs

Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source

Conflicts:

	cmd/ztest/ztest.c
---

dbaf4f6c0f55dd8c124b42af8a49369463cc97b7