summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2011-03-31 15:35:23 +0400
committerJiri Kosina <jkosina@suse.cz>2011-03-31 15:37:27 +0400
commit8d1a7ed9d0ce3556a962a7472a3d09a8332d030a (patch)
treea681bfd0ead6fa38fc4c6980dcd71f97274b4235 /CREDITS
parent86ef925f45d384d7d255859da3962ae19b24e228 (diff)
downloadlinux-8d1a7ed9d0ce3556a962a7472a3d09a8332d030a.tar.xz
CREDITS: update Johannes Berg's gpg key
I've had a new key for almost two years and revoked the old one, but forgot to update it here. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS2
1 files changed, 1 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 1d39a6d0a510..10c180311e88 100644
--- a/CREDITS
+++ b/CREDITS
@@ -328,7 +328,7 @@ S: Haifa, Israel
N: Johannes Berg
E: johannes@sipsolutions.net
W: http://johannes.sipsolutions.net/
-P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5
+P: 4096R/7BF9099A C0EB C440 F6DA 091C 884D 8532 E0F3 73F3 7BF9 099A
D: powerpc & 802.11 hacker
N: Stephen R. van den Berg (AKA BuGless)