diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /MAINTAINERS | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6d187fb934f3..ac594d26d698 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1524,6 +1524,12 @@ P: Zach Brown | |||
| 1524 | M: zab@zabbo.net | 1524 | M: zab@zabbo.net |
| 1525 | S: Odd Fixes | 1525 | S: Odd Fixes |
| 1526 | 1526 | ||
| 1527 | MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7 | ||
| 1528 | P: Michael Kerrisk | ||
| 1529 | M: mtk-manpages@gmx.net | ||
| 1530 | W: ftp://ftp.kernel.org/pub/linux/docs/manpages | ||
| 1531 | S: Maintained | ||
| 1532 | |||
| 1527 | MARVELL MV64340 ETHERNET DRIVER | 1533 | MARVELL MV64340 ETHERNET DRIVER |
| 1528 | P: Manish Lachwani | 1534 | P: Manish Lachwani |
| 1529 | M: Manish_Lachwani@pmc-sierra.com | 1535 | M: Manish_Lachwani@pmc-sierra.com |
| @@ -1655,7 +1661,7 @@ M: kuznet@ms2.inr.ac.ru | |||
| 1655 | P: Pekka Savola (ipv6) | 1661 | P: Pekka Savola (ipv6) |
| 1656 | M: pekkas@netcore.fi | 1662 | M: pekkas@netcore.fi |
| 1657 | P: James Morris | 1663 | P: James Morris |
| 1658 | M: jmorris@redhat.com | 1664 | M: jmorris@namei.org |
| 1659 | P: Hideaki YOSHIFUJI | 1665 | P: Hideaki YOSHIFUJI |
| 1660 | M: yoshfuji@linux-ipv6.org | 1666 | M: yoshfuji@linux-ipv6.org |
| 1661 | P: Patrick McHardy | 1667 | P: Patrick McHardy |
| @@ -2044,7 +2050,7 @@ SELINUX SECURITY MODULE | |||
| 2044 | P: Stephen Smalley | 2050 | P: Stephen Smalley |
| 2045 | M: sds@epoch.ncsc.mil | 2051 | M: sds@epoch.ncsc.mil |
| 2046 | P: James Morris | 2052 | P: James Morris |
| 2047 | M: jmorris@redhat.com | 2053 | M: jmorris@namei.org |
| 2048 | L: linux-kernel@vger.kernel.org (kernel issues) | 2054 | L: linux-kernel@vger.kernel.org (kernel issues) |
| 2049 | L: selinux@tycho.nsa.gov (general discussion) | 2055 | L: selinux@tycho.nsa.gov (general discussion) |
| 2050 | W: http://www.nsa.gov/selinux | 2056 | W: http://www.nsa.gov/selinux |