]> granicus.if.org Git - zfs/commitdiff
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 27 May 2010 23:13:19 +0000 (16:13 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 27 May 2010 23:13:19 +0000 (16:13 -0700)
Conflicts:
cmd/ztest/ztest.c

1  2 
cmd/ztest/ztest.c
lib/libzpool/include/sys/zfs_context.h

Simple merge