]> granicus.if.org Git - zfs/commitdiff
projects / zfs / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a06a428 45d1cae)
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
authorBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:08:36 +0000 (12:08 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:08:36 +0000 (12:08 -0700)
Conflicts:

module/zfs/dsl_deleg.c
module/zfs/rrwlock.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.