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

Simple merge
Simple merge