summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorChris Wright <chrisw@sous-sol.org>2006-03-11 12:27:19 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-11 18:19:34 +0100
commit692a2061f6f2c360188af72f1f3404a5e7f0efce (patch)
treea0af722a678966b6df2af8dbfcfe64bde15b02ac /CREDITS
parent[PATCH] remove __put_task_struct_cb export again (diff)
downloadlinux-692a2061f6f2c360188af72f1f3404a5e7f0efce.tar.xz
linux-692a2061f6f2c360188af72f1f3404a5e7f0efce.zip
[PATCH] update email address
Update email address. Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS6
1 files changed, 2 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index 6957ef4efab3..64511e2abc8e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3643,11 +3643,9 @@ S: Cambridge. CB1 7EG
S: England
N: Chris Wright
-E: chrisw@osdl.org
+E: chrisw@sous-sol.org
D: hacking on LSM framework and security modules.
-S: c/o OSDL
-S: 12725 SW Millikan Way, Suite 400
-S: Beaverton, OR 97005
+S: Portland, OR
S: USA
N: Michal Wronski