summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJames Morris <jmorris@redhat.com>2005-08-08 16:29:08 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-08 20:46:25 +0200
commit48de5beeb0ee821859c79ba5b9462654604d8bf3 (patch)
tree69ce3026aea31e44a83f23ed8ea0d700d19b4ef5 /MAINTAINERS
parent[PATCH] VIA VT8235 PCI quirk (diff)
downloadlinux-48de5beeb0ee821859c79ba5b9462654604d8bf3.tar.xz
linux-48de5beeb0ee821859c79ba5b9462654604d8bf3.zip
[PATCH] Update contact info for James Morris
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c31ddc4bcdd6..5fd00c075053 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1658,7 +1658,7 @@ M: kuznet@ms2.inr.ac.ru
P: Pekka Savola (ipv6)
M: pekkas@netcore.fi
P: James Morris
-M: jmorris@redhat.com
+M: jmorris@namei.org
P: Hideaki YOSHIFUJI
M: yoshfuji@linux-ipv6.org
P: Patrick McHardy
@@ -2047,7 +2047,7 @@ SELINUX SECURITY MODULE
P: Stephen Smalley
M: sds@epoch.ncsc.mil
P: James Morris
-M: jmorris@redhat.com
+M: jmorris@namei.org
L: linux-kernel@vger.kernel.org (kernel issues)
L: selinux@tycho.nsa.gov (general discussion)
W: http://www.nsa.gov/selinux