From 62cfe7efc4e6ba44b0903c53f09d37de59160afa Mon Sep 17 00:00:00 2001 From: Stephen Smalley Date: Sat, 4 Feb 2006 23:27:42 -0800 Subject: [PATCH] MAINTAINERS/CREDITS: Update SELinux contact info Update my contact info. Please apply. Signed-off-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- CREDITS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CREDITS') diff --git a/CREDITS b/CREDITS index 8e577ce4ab..6957ef4efa 100644 --- a/CREDITS +++ b/CREDITS @@ -3101,7 +3101,7 @@ S: Minto, NSW, 2566 S: Australia N: Stephen Smalley -E: sds@epoch.ncsc.mil +E: sds@tycho.nsa.gov D: portions of the Linux Security Module (LSM) framework and security modules N: Chris Smith -- cgit v1.2.2 From 692a2061f6f2c360188af72f1f3404a5e7f0efce Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sat, 11 Mar 2006 03:27:19 -0800 Subject: [PATCH] update email address Update email address. Signed-off-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- CREDITS | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'CREDITS') diff --git a/CREDITS b/CREDITS index 6957ef4efa..64511e2abc 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 -- cgit v1.2.2