]> granicus.if.org Git - zfs/commit
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 3 Jul 2009 00:07:52 +0000 (17:07 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 3 Jul 2009 00:07:52 +0000 (17:07 -0700)
commit480b03791d76dead9c1526b2d88b57992b3211c8
tree16a3e656137a35ee0b9cc0a715b2b0c08009f584
parentd4dbc7dca843c140a058ec8e873d6c43f5d0d12a
parent9babb37438b58e77bad04e820d5702e15b79e6a6
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces

Conflicts:

lib/libzfs/libzfs_dataset.c
cmd/zdb/zdb.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_graph.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
module/zfs/dsl_dataset.c