Skip to content

Commit

Permalink
[PATCH] Update contact info for James Morris
Browse files Browse the repository at this point in the history
  • Loading branch information
James Morris authored and Linus Torvalds committed Aug 8, 2005
1 parent 6d85f29 commit 48de5be
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CREDITS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2380,8 +2380,8 @@ E: [email protected]
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
Expand Down
4 changes: 2 additions & 2 deletions MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1658,7 +1658,7 @@ M: [email protected]
P: Pekka Savola (ipv6)
M: [email protected]
P: James Morris
M: jmorris@redhat.com
M: jmorris@namei.org
P: Hideaki YOSHIFUJI
M: [email protected]
P: Patrick McHardy
Expand Down Expand Up @@ -2047,7 +2047,7 @@ SELINUX SECURITY MODULE
P: Stephen Smalley
M: [email protected]
P: James Morris
M: jmorris@redhat.com
M: jmorris@namei.org
L: [email protected] (kernel issues)
L: [email protected] (general discussion)
W: http://www.nsa.gov/selinux
Expand Down

0 comments on commit 48de5be

Please sign in to comment.