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