diff options
author | stephen hemminger <shemminger@vyatta.com> | 2012-04-02 08:59:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-05 19:09:04 -0400 |
commit | 44c14c1d4cf9b6ef4993c4a69f479d1f13cb8b21 (patch) | |
tree | cfcf1c104e1ff85affe3b9e646a2bc86e9003bf7 | |
parent | 5a4309746cd74734daa964acb02690c22b3c8911 (diff) |
MAINTAINERS: update for Marvell Ethernet drivers
Marvell has agreed to do maintenance on the sky2 driver.
* Add the developer to the maintainers file
* Remove the old reference to the long gone (sk98lin) driver
* Rearrange to fit current topic organization
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | MAINTAINERS | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 962232d62781..c411dd16e59a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4309,6 +4309,13 @@ W: http://www.kernel.org/doc/man-pages | |||
4309 | L: linux-man@vger.kernel.org | 4309 | L: linux-man@vger.kernel.org |
4310 | S: Maintained | 4310 | S: Maintained |
4311 | 4311 | ||
4312 | MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2) | ||
4313 | M: Mirko Lindner <mlindner@marvell.com> | ||
4314 | M: Stephen Hemminger <shemminger@vyatta.com> | ||
4315 | L: netdev@vger.kernel.org | ||
4316 | S: Maintained | ||
4317 | F: drivers/net/ethernet/marvell/sk* | ||
4318 | |||
4312 | MARVELL LIBERTAS WIRELESS DRIVER | 4319 | MARVELL LIBERTAS WIRELESS DRIVER |
4313 | M: Dan Williams <dcbw@redhat.com> | 4320 | M: Dan Williams <dcbw@redhat.com> |
4314 | L: libertas-dev@lists.infradead.org | 4321 | L: libertas-dev@lists.infradead.org |
@@ -4339,12 +4346,6 @@ M: Nicolas Pitre <nico@fluxnic.net> | |||
4339 | S: Odd Fixes | 4346 | S: Odd Fixes |
4340 | F: drivers/mmc/host/mvsdio.* | 4347 | F: drivers/mmc/host/mvsdio.* |
4341 | 4348 | ||
4342 | MARVELL YUKON / SYSKONNECT DRIVER | ||
4343 | M: Mirko Lindner <mlindner@syskonnect.de> | ||
4344 | M: Ralph Roesler <rroesler@syskonnect.de> | ||
4345 | W: http://www.syskonnect.com | ||
4346 | S: Supported | ||
4347 | |||
4348 | MATROX FRAMEBUFFER DRIVER | 4349 | MATROX FRAMEBUFFER DRIVER |
4349 | L: linux-fbdev@vger.kernel.org | 4350 | L: linux-fbdev@vger.kernel.org |
4350 | S: Orphan | 4351 | S: Orphan |
@@ -6116,12 +6117,6 @@ W: http://www.winischhofer.at/linuxsisusbvga.shtml | |||
6116 | S: Maintained | 6117 | S: Maintained |
6117 | F: drivers/usb/misc/sisusbvga/ | 6118 | F: drivers/usb/misc/sisusbvga/ |
6118 | 6119 | ||
6119 | SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS | ||
6120 | M: Stephen Hemminger <shemminger@vyatta.com> | ||
6121 | L: netdev@vger.kernel.org | ||
6122 | S: Maintained | ||
6123 | F: drivers/net/ethernet/marvell/sk* | ||
6124 | |||
6125 | SLAB ALLOCATOR | 6120 | SLAB ALLOCATOR |
6126 | M: Christoph Lameter <cl@linux-foundation.org> | 6121 | M: Christoph Lameter <cl@linux-foundation.org> |
6127 | M: Pekka Enberg <penberg@kernel.org> | 6122 | M: Pekka Enberg <penberg@kernel.org> |