diff options
author | James Morris <james.l.morris@oracle.com> | 2014-09-30 16:44:04 +0200 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-09-30 16:44:04 +0200 |
commit | 6c8ff877cdf13cd5287ed9d700cfb6cb70e2bfa1 (patch) | |
tree | 2ab49b7d19fb69cdae5b6be9e7ba44f6cf3d45ef /CREDITS | |
parent | Merge tag 'keys-next-20140922' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | Linux 3.16 (diff) | |
download | linux-6c8ff877cdf13cd5287ed9d700cfb6cb70e2bfa1.tar.xz linux-6c8ff877cdf13cd5287ed9d700cfb6cb70e2bfa1.zip |
Merge commit 'v3.16' into next
Diffstat (limited to 'CREDITS')
-rw-r--r-- | CREDITS | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -3511,10 +3511,11 @@ S: MacGregor A.C.T 2615 S: Australia N: Josh Triplett -E: josh@freedesktop.org -P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87 CA26 189B 9946 D0FE 7AFB -D: rcutorture maintainer +E: josh@joshtriplett.org +P: 4096R/8AFF873D 758E 5042 E397 4BA3 3A9C 1E67 0ED9 A3DF 8AFF 873D +D: RCU and rcutorture D: lock annotations, finding and fixing lock bugs +D: kernel tinification N: Winfried Trümper E: winni@xpilot.org |