aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS19
1 files changed, 12 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a2b335c51413..50725d026da0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1469,8 +1469,6 @@ L: linux-acpi@vger.kernel.org
1469S: Supported 1469S: Supported
1470 1470
1471DOCUMENTATION (/Documentation directory) 1471DOCUMENTATION (/Documentation directory)
1472P: Michael Kerrisk
1473M: mtk.manpages@gmail.com
1474P: Randy Dunlap 1472P: Randy Dunlap
1475M: rdunlap@xenotime.net 1473M: rdunlap@xenotime.net
1476L: linux-doc@vger.kernel.org 1474L: linux-doc@vger.kernel.org
@@ -2879,7 +2877,7 @@ P: Michael Kerrisk
2879M: mtk.manpages@gmail.com 2877M: mtk.manpages@gmail.com
2880W: http://www.kernel.org/doc/man-pages 2878W: http://www.kernel.org/doc/man-pages
2881L: linux-man@vger.kernel.org 2879L: linux-man@vger.kernel.org
2882S: Supported 2880S: Maintained
2883 2881
2884MARVELL LIBERTAS WIRELESS DRIVER 2882MARVELL LIBERTAS WIRELESS DRIVER
2885P: Dan Williams 2883P: Dan Williams
@@ -3352,10 +3350,8 @@ S: Maintained
3352PARISC ARCHITECTURE 3350PARISC ARCHITECTURE
3353P: Kyle McMartin 3351P: Kyle McMartin
3354M: kyle@mcmartin.ca 3352M: kyle@mcmartin.ca
3355P: Matthew Wilcox 3353P: Helge Deller
3356M: matthew@wil.cx 3354M: deller@gmx.de
3357P: Grant Grundler
3358M: grundler@parisc-linux.org
3359L: linux-parisc@vger.kernel.org 3355L: linux-parisc@vger.kernel.org
3360W: http://www.parisc-linux.org/ 3356W: http://www.parisc-linux.org/
3361T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git 3357T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
@@ -3896,6 +3892,15 @@ L: linux-ide@vger.kernel.org
3896T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git 3892T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
3897S: Supported 3893S: Supported
3898 3894
3895SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
3896P: Sathya Perla
3897M: sathyap@serverengines.com
3898P: Subbu Seetharaman
3899M: subbus@serverengines.com
3900L: netdev@vger.kernel.org
3901W: http://www.serverengines.com
3902S: Supported
3903
3899SFC NETWORK DRIVER 3904SFC NETWORK DRIVER
3900P: Steve Hodgson 3905P: Steve Hodgson
3901P: Ben Hutchings 3906P: Ben Hutchings