diff options
author | Stephen Smalley <sds@tycho.nsa.gov> | 2006-02-05 02:27:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-05 14:06:51 -0500 |
commit | 62cfe7efc4e6ba44b0903c53f09d37de59160afa (patch) | |
tree | 20cd9287e5acf9d057d1b0784df8514bdec3da90 | |
parent | 7128ec2a747d7a5f3c764c37bef17081ccc2374c (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-- | CREDITS | 2 | ||||
-rw-r--r-- | MAINTAINERS | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -3101,7 +3101,7 @@ S: Minto, NSW, 2566 | |||
3101 | S: Australia | 3101 | S: Australia |
3102 | 3102 | ||
3103 | N: Stephen Smalley | 3103 | N: Stephen Smalley |
3104 | E: sds@epoch.ncsc.mil | 3104 | E: sds@tycho.nsa.gov |
3105 | D: portions of the Linux Security Module (LSM) framework and security modules | 3105 | D: portions of the Linux Security Module (LSM) framework and security modules |
3106 | 3106 | ||
3107 | N: Chris Smith | 3107 | N: Chris Smith |
diff --git a/MAINTAINERS b/MAINTAINERS index b6cbac5dbfd5..11d44daa6025 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2298,7 +2298,7 @@ S: Supported | |||
2298 | 2298 | ||
2299 | SELINUX SECURITY MODULE | 2299 | SELINUX SECURITY MODULE |
2300 | P: Stephen Smalley | 2300 | P: Stephen Smalley |
2301 | M: sds@epoch.ncsc.mil | 2301 | M: sds@tycho.nsa.gov |
2302 | P: James Morris | 2302 | P: James Morris |
2303 | M: jmorris@namei.org | 2303 | M: jmorris@namei.org |
2304 | L: linux-kernel@vger.kernel.org (kernel issues) | 2304 | L: linux-kernel@vger.kernel.org (kernel issues) |