]> granicus.if.org Git - zfs/commitdiff
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
authorBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:09:52 +0000 (12:09 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:09:52 +0000 (12:09 -0700)
1  2 
module/zfs/dsl_dataset.c
module/zfs/zap_micro.c

Simple merge
Simple merge