summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-07-31 01:08:42 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-31 02:16:13 +0200
commite0198b290dcd8313bdf313a0d083033d5c01d761 (patch)
treea1b028afe393695ea8ccbe4a2ef7742b94d82ef7 /CREDITS
parentkexec: export free_huge_page to VMCOREINFO (diff)
downloadlinux-e0198b290dcd8313bdf313a0d083033d5c01d761.tar.xz
linux-e0198b290dcd8313bdf313a0d083033d5c01d761.zip
Josh has moved
My IBM email addresses haven't worked for years; also map some old-but-functional forwarding addresses to my canonical address. Update my GPG key fingerprint; I moved to 4096R a long time ago. Update description. Signed-off-by: Josh Triplett <josh@joshtriplett.org> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS7
1 files changed, 4 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index 28ee1514b9de..a80b66718f66 100644
--- a/CREDITS
+++ b/CREDITS
@@ -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