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

Trivial merge