]> granicus.if.org Git - zfs/commitdiff
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
authorBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 3 Dec 2008 20:51:06 +0000 (12:51 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 3 Dec 2008 20:51:06 +0000 (12:51 -0800)
1  2 
zfs/lib/libzfs/libzfs_config.c

Simple merge