From: Kees Cook <kees@outflux.net>
Date: Fri, 2 Dec 2011 03:06:48 +0000 (+1100)
Subject: CREDITS: update Kees's expired fingerprint and fix details
X-Git-Tag: next-20111207~2^2~218
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=48a98ba8f37d48d8ebddef86cd73bceaf37b1eac;p=karo-tx-linux.git

CREDITS: update Kees's expired fingerprint and fix details

Small clean-up for my CREDITS entry; the GPG fingerprint was not up to
date, so I fixed other details at the same time too.

Signed-off-by: Kees Cook <kees@outflux.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/CREDITS b/CREDITS
index 557da475bc9c..370b4c7da39b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -693,10 +693,13 @@ S: Oxfordshire, UK.
 
 N: Kees Cook
 E: kees@outflux.net
-W: http://outflux.net/
-P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30  1975 1FFF 4BA9 1706 3E6D
-D: Minor updates to SCSI types, added /proc/pid/maps protection
+E: kees@ubuntu.com
+E: keescook@chromium.org
+W: http://outflux.net/blog/
+P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E  6E13 8972 F4DF DC6D C026
+D: Various security things, bug fixes, and documentation.
 S: (ask for current address)
+S: Portland, Oregon
 S: USA
 
 N: Robin Cornelius