diff options
-rw-r--r-- | CREDITS | 4 | ||||
-rw-r--r-- | MAINTAINERS | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com | |||
2380 | D: bug fixes, documentation, minor hackery | 2380 | D: bug fixes, documentation, minor hackery |
2381 | 2381 | ||
2382 | N: James Morris | 2382 | N: James Morris |
2383 | E: jmorris@redhat.com | 2383 | E: jmorris@namei.org |
2384 | W: http://www.intercode.com.au/jmorris/ | 2384 | W: http://namei.org/ |
2385 | D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec, | 2385 | D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec, |
2386 | D: Crypto API, general networking, miscellaneous. | 2386 | D: Crypto API, general networking, miscellaneous. |
2387 | S: PO Box 707 | 2387 | S: 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 | |||
1658 | P: Pekka Savola (ipv6) | 1658 | P: Pekka Savola (ipv6) |
1659 | M: pekkas@netcore.fi | 1659 | M: pekkas@netcore.fi |
1660 | P: James Morris | 1660 | P: James Morris |
1661 | M: jmorris@redhat.com | 1661 | M: jmorris@namei.org |
1662 | P: Hideaki YOSHIFUJI | 1662 | P: Hideaki YOSHIFUJI |
1663 | M: yoshfuji@linux-ipv6.org | 1663 | M: yoshfuji@linux-ipv6.org |
1664 | P: Patrick McHardy | 1664 | P: Patrick McHardy |
@@ -2047,7 +2047,7 @@ SELINUX SECURITY MODULE | |||
2047 | P: Stephen Smalley | 2047 | P: Stephen Smalley |
2048 | M: sds@epoch.ncsc.mil | 2048 | M: sds@epoch.ncsc.mil |
2049 | P: James Morris | 2049 | P: James Morris |
2050 | M: jmorris@redhat.com | 2050 | M: jmorris@namei.org |
2051 | L: linux-kernel@vger.kernel.org (kernel issues) | 2051 | L: linux-kernel@vger.kernel.org (kernel issues) |
2052 | L: selinux@tycho.nsa.gov (general discussion) | 2052 | L: selinux@tycho.nsa.gov (general discussion) |
2053 | W: http://www.nsa.gov/selinux | 2053 | W: http://www.nsa.gov/selinux |