From: Stephen Smalley Date: Sun, 5 Feb 2006 07:27:42 +0000 (-0800) Subject: [PATCH] MAINTAINERS/CREDITS: Update SELinux contact info X-Git-Tag: v2.6.16-rc3~169 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62cfe7efc4e6ba44b0903c53f09d37de59160afa;p=pandora-kernel.git [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 --- 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)