From 8f108032def7020413701ff251b8ad61a99513d3 Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Mon, 2 Apr 2012 12:59:47 +0000 Subject: [PATCH] --- yaml --- r: 298779 b: refs/heads/master c: 44c14c1d4cf9b6ef4993c4a69f479d1f13cb8b21 h: refs/heads/master i: 298777: 9bfc1c1e43d85f8c1ab675d065065a3cd08df605 298775: 2008584c99429b7efb30b4ed1d3e0acbfd17a035 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index f442378611c7..cea0516565fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a4309746cd74734daa964acb02690c22b3c8911 +refs/heads/master: 44c14c1d4cf9b6ef4993c4a69f479d1f13cb8b21 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 962232d62781..c411dd16e59a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4309,6 +4309,13 @@ W: http://www.kernel.org/doc/man-pages L: linux-man@vger.kernel.org S: Maintained +MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2) +M: Mirko Lindner +M: Stephen Hemminger +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/ethernet/marvell/sk* + MARVELL LIBERTAS WIRELESS DRIVER M: Dan Williams L: libertas-dev@lists.infradead.org @@ -4339,12 +4346,6 @@ M: Nicolas Pitre S: Odd Fixes F: drivers/mmc/host/mvsdio.* -MARVELL YUKON / SYSKONNECT DRIVER -M: Mirko Lindner -M: Ralph Roesler -W: http://www.syskonnect.com -S: Supported - MATROX FRAMEBUFFER DRIVER L: linux-fbdev@vger.kernel.org S: Orphan @@ -6116,12 +6117,6 @@ W: http://www.winischhofer.at/linuxsisusbvga.shtml S: Maintained F: drivers/usb/misc/sisusbvga/ -SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS -M: Stephen Hemminger -L: netdev@vger.kernel.org -S: Maintained -F: drivers/net/ethernet/marvell/sk* - SLAB ALLOCATOR M: Christoph Lameter M: Pekka Enberg