aboutsummaryrefslogtreecommitdiffstats
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 14:46:25 -0400
commit48de5beeb0ee821859c79ba5b9462654604d8bf3 (patch)
tree69ce3026aea31e44a83f23ed8ea0d700d19b4ef5
parent6d85f29bb54235d2e184e7155dcd4de908324fe6 (diff)
[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 d97e62524ddc..50121d432b62 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com
2380D: bug fixes, documentation, minor hackery 2380D: bug fixes, documentation, minor hackery
2381 2381
2382N: James Morris 2382N: James Morris
2383E: jmorris@redhat.com 2383E: jmorris@namei.org
2384W: http://www.intercode.com.au/jmorris/ 2384W: http://namei.org/
2385D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec, 2385D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,
2386D: Crypto API, general networking, miscellaneous. 2386D: Crypto API, general networking, miscellaneous.
2387S: PO Box 707 2387S: PO Box 707
diff --git a/MAINTAINERS b/MAINTAINERS
index c31ddc4bcdd6..5fd00c075053 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1658,7 +1658,7 @@ M: kuznet@ms2.inr.ac.ru
1658P: Pekka Savola (ipv6) 1658P: Pekka Savola (ipv6)
1659M: pekkas@netcore.fi 1659M: pekkas@netcore.fi
1660P: James Morris 1660P: James Morris
1661M: jmorris@redhat.com 1661M: jmorris@namei.org
1662P: Hideaki YOSHIFUJI 1662P: Hideaki YOSHIFUJI
1663M: yoshfuji@linux-ipv6.org 1663M: yoshfuji@linux-ipv6.org
1664P: Patrick McHardy 1664P: Patrick McHardy
@@ -2047,7 +2047,7 @@ SELINUX SECURITY MODULE
2047P: Stephen Smalley 2047P: Stephen Smalley
2048M: sds@epoch.ncsc.mil 2048M: sds@epoch.ncsc.mil
2049P: James Morris 2049P: James Morris
2050M: jmorris@redhat.com 2050M: jmorris@namei.org
2051L: linux-kernel@vger.kernel.org (kernel issues) 2051L: linux-kernel@vger.kernel.org (kernel issues)
2052L: selinux@tycho.nsa.gov (general discussion) 2052L: selinux@tycho.nsa.gov (general discussion)
2053W: http://www.nsa.gov/selinux 2053W: http://www.nsa.gov/selinux