From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 28 May 2010 21:28:49 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~34^2~1^2^2~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c35ee68a3774adcb71da1114797a1ad06515e3b;p=zfs

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
---

0c35ee68a3774adcb71da1114797a1ad06515e3b