aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2012-04-02 08:59:47 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-05 19:09:04 -0400
commit44c14c1d4cf9b6ef4993c4a69f479d1f13cb8b21 (patch)
treecfcf1c104e1ff85affe3b9e646a2bc86e9003bf7
parent5a4309746cd74734daa964acb02690c22b3c8911 (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--MAINTAINERS19
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
4309L: linux-man@vger.kernel.org 4309L: linux-man@vger.kernel.org
4310S: Maintained 4310S: Maintained
4311 4311
4312MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
4313M: Mirko Lindner <mlindner@marvell.com>
4314M: Stephen Hemminger <shemminger@vyatta.com>
4315L: netdev@vger.kernel.org
4316S: Maintained
4317F: drivers/net/ethernet/marvell/sk*
4318
4312MARVELL LIBERTAS WIRELESS DRIVER 4319MARVELL LIBERTAS WIRELESS DRIVER
4313M: Dan Williams <dcbw@redhat.com> 4320M: Dan Williams <dcbw@redhat.com>
4314L: libertas-dev@lists.infradead.org 4321L: libertas-dev@lists.infradead.org
@@ -4339,12 +4346,6 @@ M: Nicolas Pitre <nico@fluxnic.net>
4339S: Odd Fixes 4346S: Odd Fixes
4340F: drivers/mmc/host/mvsdio.* 4347F: drivers/mmc/host/mvsdio.*
4341 4348
4342MARVELL YUKON / SYSKONNECT DRIVER
4343M: Mirko Lindner <mlindner@syskonnect.de>
4344M: Ralph Roesler <rroesler@syskonnect.de>
4345W: http://www.syskonnect.com
4346S: Supported
4347
4348MATROX FRAMEBUFFER DRIVER 4349MATROX FRAMEBUFFER DRIVER
4349L: linux-fbdev@vger.kernel.org 4350L: linux-fbdev@vger.kernel.org
4350S: Orphan 4351S: Orphan
@@ -6116,12 +6117,6 @@ W: http://www.winischhofer.at/linuxsisusbvga.shtml
6116S: Maintained 6117S: Maintained
6117F: drivers/usb/misc/sisusbvga/ 6118F: drivers/usb/misc/sisusbvga/
6118 6119
6119SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
6120M: Stephen Hemminger <shemminger@vyatta.com>
6121L: netdev@vger.kernel.org
6122S: Maintained
6123F: drivers/net/ethernet/marvell/sk*
6124
6125SLAB ALLOCATOR 6120SLAB ALLOCATOR
6126M: Christoph Lameter <cl@linux-foundation.org> 6121M: Christoph Lameter <cl@linux-foundation.org>
6127M: Pekka Enberg <penberg@kernel.org> 6122M: Pekka Enberg <penberg@kernel.org>