]> granicus.if.org Git - zfs/commit
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 21:46:39 +0000 (14:46 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 21:46:39 +0000 (14:46 -0700)
commit3571832262df85ee9bf3e60829fffca45a276eae
treea4ceb7f11a8d84e57cc49aed992f828457dc929d
parent9755dc8804dbefd08e28da5ceed0f14ca3a43fdc
parent428870ff734fdaccc342b33fc53cf94724409a46
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces

Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
cmd/zdb/zdb.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
module/zfs/dsl_dataset.c