Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  maintainers: update my email address

1 files changed, 2 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 9a648eb8e213..924fb0bb52e0 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