aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2006-02-04 23:27:42 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-05 11:06:51 -0800
commit62cfe7efc4e6ba44b0903c53f09d37de59160afa (patch)
tree20cd9287e5acf9d057d1b0784df8514bdec3da90
parent7128ec2a747d7a5f3c764c37bef17081ccc2374c (diff)
[PATCH] MAINTAINERS/CREDITS: Update SELinux contact info
Update my contact info. Please apply. Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--CREDITS2
-rw-r--r--MAINTAINERS2
2 files changed, 2 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 8e577ce4abeb..6957ef4efab3 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
diff --git a/MAINTAINERS b/MAINTAINERS
index b6cbac5dbfd5..11d44daa6025 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2298,7 +2298,7 @@ S: Supported
SELINUX SECURITY MODULE
P: Stephen Smalley
-M: sds@epoch.ncsc.mil
+M: sds@tycho.nsa.gov
P: James Morris
M: jmorris@namei.org
L: linux-kernel@vger.kernel.org (kernel issues)

Privacy Policy