]> granicus.if.org Git - zfs/commitdiff
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 22:38:43 +0000 (15:38 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 22:38:43 +0000 (15:38 -0700)
Conflicts:
module/zfs/dbuf.c
module/zfs/dsl_dataset.c

1  2 
module/zfs/dbuf.c
module/zfs/dsl_dataset.c

Simple merge
Simple merge