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
+E: josh@joshtriplett.org
-P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87  CA26 189B 9946 D0FE 7AFB
+P: 4096R/8AFF873D 758E 5042 E397 4BA3 3A9C  1E67 0ED9 A3DF 8AFF 873D
-D: rcutorture maintainer
+D: RCU and rcutorture
 D: lock annotations, finding and fixing lock bugs
+D: kernel tinification
 N: Winfried Trümper
 E: winni@xpilot.org

diff --git a/CREDITS b/CREDITS index 28ee1514b9de..a80b66718f66 100644 --- a/CREDITS +++ b/CREDITS
@@ -3511,10 +3511,11 @@ S: MacGregor A.C.T 2615
3511	S: Australia	3511	S: Australia
3512		3512
3513	N: Josh Triplett	3513	N: Josh Triplett
3514	E: josh@freedesktop.org	3514	E: josh@joshtriplett.org
3515	P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87 CA26 189B 9946 D0FE 7AFB	3515	P: 4096R/8AFF873D 758E 5042 E397 4BA3 3A9C 1E67 0ED9 A3DF 8AFF 873D
3516	D: rcutorture maintainer	3516	D: RCU and rcutorture
3517	D: lock annotations, finding and fixing lock bugs	3517	D: lock annotations, finding and fixing lock bugs
		3518	D: kernel tinification
3518		3519
3519	N: Winfried Trümper	3520	N: Winfried Trümper
3520	E: winni@xpilot.org	3521	E: winni@xpilot.org