From 48de5beeb0ee821859c79ba5b9462654604d8bf3 Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@redhat.com>
Date: Mon, 8 Aug 2005 10:29:08 -0400
Subject: [PATCH] Update contact info for James Morris

---
 CREDITS     | 4 ++--
 MAINTAINERS | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CREDITS b/CREDITS
index d97e62524d..50121d432b 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 c31ddc4bcd..5fd00c0750 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
-- 
cgit v1.2.2