]> granicus.if.org Git - zfs/commitdiff
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 20:54:54 +0000 (13:54 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 20:54:54 +0000 (13:54 -0700)

Trivial merge