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

Trivial merge