]> granicus.if.org Git - zfs/commitdiff
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 23 Jul 2010 18:42:22 +0000 (11:42 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 23 Jul 2010 18:42:22 +0000 (11:42 -0700)
1  2 
lib/libzpool/kernel.c

Simple merge