From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 27 May 2010 23:13:19 +0000 (-0700)
Subject: Merge branch 'feature-branch' into refs/top-bases/zfs-branch
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~45^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=319f69734b1c6eb3acc707021437aae666f976b6;p=zfs

Merge branch 'feature-branch' into refs/top-bases/zfs-branch

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

319f69734b1c6eb3acc707021437aae666f976b6