]> granicus.if.org Git - zfs/commit
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 22:39:07 +0000 (15:39 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 22:39:07 +0000 (15:39 -0700)
commit06ba6dc528917369be02e214a64361a133c654da
tree76f9b68aed93b8e648fafc05be49f8da26160499
parent0b0deba9fc9d30a97008bc772ad52be418af872d
parent3571832262df85ee9bf3e60829fffca45a276eae
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch

Conflicts:
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_pool.c