]> granicus.if.org Git - zfs/commitdiff
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 14 Jun 2010 21:42:56 +0000 (14:42 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 14 Jun 2010 21:42:56 +0000 (14:42 -0700)
1  2 
cmd/zdb/zdb.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_pool.c
module/zfs/zfs_ioctl.c

diff --cc cmd/zdb/zdb.c
Simple merge
Simple merge
Simple merge
Simple merge