]> granicus.if.org Git - zfs/commitdiff
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 16 Nov 2009 00:26:38 +0000 (16:26 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 16 Nov 2009 00:26:38 +0000 (16:26 -0800)

Trivial merge