]> granicus.if.org Git - zfs/commitdiff
Merge commit 'refs/top-bases/fix-acl' into fix-acl
authorBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:10:23 +0000 (12:10 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:10:23 +0000 (12:10 -0700)
1  2 
lib/libzfs/libzfs_dataset.c

Simple merge