]> granicus.if.org Git - zfs/commitdiff
Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 16 Jun 2010 21:39:41 +0000 (14:39 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 16 Jun 2010 21:39:41 +0000 (14:39 -0700)

Trivial merge