diff --git a/[refs] b/[refs] index c29af79b8edd..052cb40fd82a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7128ec2a747d7a5f3c764c37bef17081ccc2374c +refs/heads/master: 62cfe7efc4e6ba44b0903c53f09d37de59160afa diff --git a/trunk/CREDITS b/trunk/CREDITS index 8e577ce4abeb..6957ef4efab3 100644 --- a/trunk/CREDITS +++ b/trunk/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/trunk/MAINTAINERS b/trunk/MAINTAINERS index b6cbac5dbfd5..11d44daa6025 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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)