Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48de5bee authored by James Morris's avatar James Morris Committed by Linus Torvalds
Browse files

[PATCH] Update contact info for James Morris

parent 6d85f29b

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -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

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -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