]> granicus.if.org Git - zfs/commitdiff
Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 28 Jun 2010 17:36:17 +0000 (10:36 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 28 Jun 2010 17:36:17 +0000 (10:36 -0700)

Trivial merge