OpenZFS on Linux and FreeBSD
Go to file
Brian Behlendorf 0c35ee68a3 Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Conflicts:
	cmd/zfs/zfs_util.h
	cmd/zinject/zinject.h
	cmd/zpool/zpool_util.c
	lib/libnvpair/include/libnvpair.h
	lib/libnvpair/libnvpair.c
	lib/libzfs/libzfs_config.c
	lib/libzfs/libzfs_import.c
	module/avl/avl.c
	module/avl/include/sys/avl.h
	module/nvpair/include/sys/nvpair.h
	module/nvpair/nvpair.c
	module/zcommon/include/zfs_comutil.h
	module/zcommon/include/zfs_prop.h
	module/zcommon/zfs_comutil.c
	module/zfs/dmu_zfetch.c
	module/zfs/dsl_synctask.c
	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/dmu_zfetch.h
	module/zfs/include/sys/dsl_synctask.h
	module/zfs/include/sys/refcount.h
	module/zfs/include/sys/txg.h
	module/zfs/include/sys/uberblock.h
	module/zfs/include/sys/zap_leaf.h
	module/zfs/include/sys/zfs_debug.h
	module/zfs/include/sys/zio_compress.h
	module/zfs/include/sys/zvol.h
	module/zfs/lzjb.c
	module/zfs/refcount.c
	module/zfs/sha256.c
	module/zfs/spa_boot.c
	module/zfs/uberblock.c
	module/zfs/zfs_replay.c
	module/zfs/zio_compress.c
2010-05-28 14:28:49 -07:00
cmd Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-05-28 14:28:49 -07:00
lib Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-05-28 14:28:49 -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 commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-05-28 14:28:49 -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 Added 'gcc-ident-pragmas' branch. 2009-03-11 10:59:45 -07:00
.topmsg Update .topmsg for consistent with with gcc topic branches 2009-03-11 22:22:01 -07: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