From: James Morris <james.l.morris@oracle.com>
Date: Wed, 22 Feb 2012 01:45:07 +0000 (+1100)
Subject: maintainers: update my email address
X-Git-Tag: v3.3-rc5~25^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9b45c0d2c50e19bd73d2f5e18dd6912a6991306e;p=linux-block.git

maintainers: update my email address

Update my email address.

Signed-off-by: James Morris <james.l.morris@oracle.com>
---

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