]> granicus.if.org Git - zfs/commitdiff
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 14 Jun 2010 22:36:59 +0000 (15:36 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 14 Jun 2010 22:36:59 +0000 (15:36 -0700)
1  2 
cmd/ztest/ztest.c
module/zfs/dsl_prop.c
module/zfs/sa.c
module/zfs/zfs_ioctl.c

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