summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-03-16 09:15:13 -0500
committerFelix Blyakher <felixb@sgi.com>2009-03-16 09:15:13 -0500
commitcb1b77804091cc3491da4338a3599e318f358b25 (patch)
tree481372e91d926b566d7e59c08a97bd3c16c5026a /MAINTAINERS
parentda5309cd28ffda6ed8a4147bd14f1e4fbbd6503d (diff)
parent5bee17f18b595937e6beafeee5197868a3f74a06 (diff)
downloadkernel-crypto-cb1b77804091cc3491da4338a3599e318f358b25.tar.gz
kernel-crypto-cb1b77804091cc3491da4338a3599e318f358b25.tar.xz
kernel-crypto-cb1b77804091cc3491da4338a3599e318f358b25.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 3 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 12e2369abe5..8c680920561 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1469,8 +1469,6 @@ L: linux-acpi@vger.kernel.org
S: Supported
DOCUMENTATION (/Documentation directory)
-P: Michael Kerrisk
-M: mtk.manpages@gmail.com
P: Randy Dunlap
M: rdunlap@xenotime.net
L: linux-doc@vger.kernel.org
@@ -2879,7 +2877,7 @@ P: Michael Kerrisk
M: mtk.manpages@gmail.com
W: http://www.kernel.org/doc/man-pages
L: linux-man@vger.kernel.org
-S: Supported
+S: Maintained
MARVELL LIBERTAS WIRELESS DRIVER
P: Dan Williams
@@ -3352,10 +3350,8 @@ S: Maintained
PARISC ARCHITECTURE
P: Kyle McMartin
M: kyle@mcmartin.ca
-P: Matthew Wilcox
-M: matthew@wil.cx
-P: Grant Grundler
-M: grundler@parisc-linux.org
+P: Helge Deller
+M: deller@gmx.de
L: linux-parisc@vger.kernel.org
W: http://www.parisc-linux.org/
T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git