aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2012-02-22 12:45:07 +1100
committerJames Morris <james.l.morris@oracle.com>2012-02-22 12:45:07 +1100
commit9b45c0d2c50e19bd73d2f5e18dd6912a6991306e (patch)
tree840aa31e544d5ff5db1c99333a39a66f20578f25 /MAINTAINERS
parent27e74da9800289e69ba907777df1e2085231eff7 (diff)
downloadlinaro-lsk-9b45c0d2c50e19bd73d2f5e18dd6912a6991306e.tar.gz
maintainers: update my email address
Update my email address. Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9a648eb8e21..924fb0bb52e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5861,7 +5861,7 @@ S: Maintained
F: drivers/mmc/host/sdhci-spear.c
SECURITY SUBSYSTEM
-M: James Morris <jmorris@namei.org>
+M: James Morris <james.l.morris@oracle.com>
L: linux-security-module@vger.kernel.org (suggested Cc:)
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
W: http://security.wiki.kernel.org/
@@ -5874,7 +5874,7 @@ S: Supported
SELINUX SECURITY MODULE
M: Stephen Smalley <sds@tycho.nsa.gov>
-M: James Morris <jmorris@namei.org>
+M: James Morris <james.l.morris@oracle.com>
M: Eric Paris <eparis@parisplace.org>
L: selinux@tycho.nsa.gov (subscribers-only, general discussion)
W: http://selinuxproject.org