Brian Behlendorf 149c4b2731 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch ... Conflicts: cmd/ztest/ztest.c lib/libzfs/libzfs_pool.c module/zcommon/zfs_namecheck.c module/zfs/dmu.c module/zfs/include/sys/dmu.h module/zfs/include/sys/zfs_fuid.h module/zfs/spa.c module/zfs/vdev.c module/zfs/zap_micro.c module/zfs/zfs_fuid.c module/zfs/zfs_ioctl.c module/zfs/zfs_vfsops.c module/zfs/zfs_znode.c		2009-07-06 13:40:29 -07:00
..
include/sys	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
Makefile.in	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-03-10 21:28:01 -07:00
arc.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
bplist.c	Move the world out of /zfs/ and seperate out module build tree	2008-12-11 11:08:09 -08:00
dbuf.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
dmu.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
dmu_object.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
dmu_objset.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
dmu_send.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
dmu_traverse.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
dmu_tx.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
dmu_zfetch.c	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-03-19 15:30:32 -07:00
dnode.c	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-07-06 13:11:34 -07:00
dnode_sync.c	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-07-06 13:11:34 -07:00
dsl_dataset.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
dsl_deleg.c	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-03-11 11:17:23 -07:00
dsl_dir.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
dsl_pool.c	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-07-06 13:11:34 -07:00
dsl_prop.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
dsl_scrub.c	Merge commit 'refs/top-bases/gcc-c90' into gcc-c90	2009-07-02 16:18:03 -07:00
dsl_synctask.c	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-03-11 11:17:23 -07:00
fletcher.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
gzip.c	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-03-11 11:09:11 -07:00
lzjb.c	Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch	2009-03-11 11:00:42 -07:00
metaslab.c	Merge commit 'refs/top-bases/gcc-c90' into gcc-c90	2009-07-02 16:18:03 -07:00
refcount.c	Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch	2009-03-11 11:00:42 -07:00
rrwlock.c	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-03-11 11:22:11 -07:00
sha256.c	Added 'gcc-ident-pragmas' branch.	2009-03-11 10:59:45 -07:00
spa.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
spa_boot.c	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-03-11 11:17:23 -07:00
spa_config.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
spa_errlog.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
spa_history.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
spa_misc.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
space_map.c	Rebase master to b117	2009-07-02 15:44:48 -07:00
txg.c	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-03-20 13:26:18 -07:00
uberblock.c	Added 'gcc-ident-pragmas' branch.	2009-03-11 10:59:45 -07:00
unique.c	Added 'gcc-ident-pragmas' branch.	2009-03-11 10:59:45 -07:00
vdev.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
vdev_cache.c	Merge commit 'refs/top-bases/gcc-unused' into gcc-unused	2009-02-18 14:04:04 -08:00
vdev_disk.c	Add zfs_config.h include for HAVE_2ARGS_BIO_END_IO_T define	2009-03-17 15:14:02 -07:00
vdev_file.c	Rebase master to b105	2009-01-15 13:59:39 -08:00
vdev_label.c	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2009-07-02 16:49:11 -07:00
vdev_mirror.c	Merge commit 'refs/top-bases/gcc-c90' into gcc-c90	2009-02-18 13:09:32 -08:00
vdev_missing.c	Move the world out of /zfs/ and seperate out module build tree	2008-12-11 11:08:09 -08:00
vdev_queue.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
vdev_raidz.c	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2009-07-02 16:49:11 -07:00
vdev_root.c	Move the world out of /zfs/ and seperate out module build tree	2008-12-11 11:08:09 -08:00
zap.c	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-07-06 13:11:34 -07:00
zap_leaf.c	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2009-07-02 16:49:11 -07:00
zap_micro.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zfs_acl.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zfs_byteswap.c	Resolve conflict with removed cleaner type	2009-01-15 14:20:49 -08:00
zfs_ctldir.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zfs_dir.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zfs_fm.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zfs_fuid.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zfs_ioctl.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zfs_log.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zfs_replay.c	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-03-11 11:22:11 -07:00
zfs_rlock.c	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-02-18 14:38:20 -08:00
zfs_vfsops.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zfs_vnops.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zfs_znode.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zil.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zio.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00
zio_checksum.c	Move the world out of /zfs/ and seperate out module build tree	2008-12-11 11:08:09 -08:00
zio_compress.c	Added 'gcc-ident-pragmas' branch.	2009-03-11 10:59:45 -07:00
zio_inject.c	Rebase master to b117	2009-07-02 15:44:48 -07:00
zvol.c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-07-06 13:40:29 -07:00