summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2006-02-05 08:27:42 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-05 20:06:51 +0100
commit62cfe7efc4e6ba44b0903c53f09d37de59160afa (patch)
tree20cd9287e5acf9d057d1b0784df8514bdec3da90 /CREDITS
parent[PATCH] fuse: fix request_end() vs fuse_reset_request() race (diff)
downloadlinux-62cfe7efc4e6ba44b0903c53f09d37de59160afa.tar.xz
linux-62cfe7efc4e6ba44b0903c53f09d37de59160afa.zip
[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>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS2
1 files changed, 1 insertions, 1 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