]> granicus.if.org Git - zfs/commit
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 20:52:52 +0000 (13:52 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 20:52:52 +0000 (13:52 -0700)
commit0d4d1a7861bd01c4d10cade27d7d345c0d744018
treebc3ee602c22828987ab436807db642ded5200986
parente3dccb92797ff6f635aa931026a6ce9ba9833840
parent428870ff734fdaccc342b33fc53cf94724409a46
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks

Conflicts:
module/zfs/dsl_dataset.c
module/zfs/dsl_dataset.c
module/zfs/zap.c
module/zfs/zap_micro.c