summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Morris <jmorris@redhat.com>2005-08-08 10:29:08 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-08 11:46:25 -0700
commit48de5beeb0ee821859c79ba5b9462654604d8bf3 (patch)
tree69ce3026aea31e44a83f23ed8ea0d700d19b4ef5
parent6d85f29bb54235d2e184e7155dcd4de908324fe6 (diff)
downloadop-kernel-dev-48de5beeb0ee821859c79ba5b9462654604d8bf3.zip
op-kernel-dev-48de5beeb0ee821859c79ba5b9462654604d8bf3.tar.gz
[PATCH] Update contact info for James Morris
-rw-r--r--CREDITS4
-rw-r--r--MAINTAINERS4
2 files changed, 4 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index d97e625..50121d4 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com
D: bug fixes, documentation, minor hackery
N: James Morris
-E: jmorris@redhat.com
-W: http://www.intercode.com.au/jmorris/
+E: jmorris@namei.org
+W: http://namei.org/
D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,
D: Crypto API, general networking, miscellaneous.
S: PO Box 707
diff --git a/MAINTAINERS b/MAINTAINERS
index c31ddc4..5fd00c0 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
OpenPOWER on IntegriCloud