diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-09 17:20:49 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-09 17:20:49 -0400 |
| commit | 471417c9cfb4c2574e2c03bf2273fe12f5388a8e (patch) | |
| tree | ac026ba976bc253fc87a5cdec8f33d24d03e1c9c /MAINTAINERS | |
| parent | 20e007b8cc1266ff78810457d6e26c35c6b810ba (diff) | |
| parent | db29e85a7ece62de1899917c1ec0ffe55cf1d3a0 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
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 |