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

Simple merge