OpenZFS on Linux and FreeBSD
Go to file
Brian Behlendorf ffeafc898e Merge branch 'fix-branch' into refs/top-bases/zfs-branch
Conflicts:

	cmd/ztest/ztest.c
2010-06-29 10:55:38 -07:00
cmd Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-29 10:55:38 -07:00
lib Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-29 10:55:38 -07:00
man/man8 Pull in latest man pages as part of update-zfs.sh 2009-12-11 16:15:33 -08:00
module Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-29 10:55:38 -07:00
scripts Update core ZFS code from build 121 to build 141. 2010-05-28 13:45:14 -07:00
.gitignore Ignore unsigned module build products 2010-03-09 14:14:09 -08:00
.topdeps Remove gcc-shadow from gcc-branch 2010-05-28 12:44:01 -07:00
.topmsg Refresh gcc-branch 2008-12-05 14:31:46 -08:00
AUTHORS Add AUTHORS to master branch 2010-05-18 14:55:01 -07:00
COPYING Relocate COPYING+COPYRIGHT, remove README cruft 2008-12-01 15:34:53 -08:00
COPYRIGHT Update COPYRIGHT to reference zpios CDDL exceptions. 2010-05-18 14:25:28 -07:00
DISCLAIMER Update COPYRIGHT and DISCLAIMER. 2010-05-18 10:32:23 -07:00
GIT Refresh type in topgit git://* reference 2009-01-26 21:58:32 -08:00
OPENSOLARIS.LICENSE Add CDDL license file 2008-12-01 14:49:34 -08:00
ZFS.RELEASE Update core ZFS code from build 121 to build 141. 2010-05-28 13:45:14 -07:00