]> granicus.if.org Git - zfs/commitdiff
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 14 Jun 2010 22:37:01 +0000 (15:37 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 14 Jun 2010 22:37:01 +0000 (15:37 -0700)
1  2 
cmd/zpool/zpool_main.c
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dsl_dataset.c
module/zfs/sa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zil.c
module/zfs/zio.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc module/zfs/sa.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge