]> granicus.if.org Git - zfs/commit
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 21:56:00 +0000 (14:56 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 21:56:00 +0000 (14:56 -0700)
commitcd47feb3c81db6181f7480a79d46b94609f804f9
tree52610b4f387170f27ff17a8ab4f246c3ce8f63e2
parente38df7bbe636a0ded6757d1cfa1a2498feddee85
parent428870ff734fdaccc342b33fc53cf94724409a46
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit

Conflicts:
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c
module/zfs/arc.c
20 files changed:
cmd/zfs/zfs_main.c
cmd/zpool/zpool_main.c
cmd/zpool/zpool_vdev.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_util.c
module/nvpair/nvpair.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_traverse.c
module/zfs/dsl_dataset.c
module/zfs/lzjb.c
module/zfs/refcount.c
module/zfs/spa.c
module/zfs/spa_misc.c
module/zfs/vdev_label.c
module/zfs/vdev_raidz.c
module/zfs/zap_leaf.c
module/zfs/zfs_byteswap.c
module/zfs/zfs_rlock.c