summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2008-06-17 23:24:19 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-06-17 23:24:19 -0400
commitebaac8c9a5b9e8aeab4009cefcfc1e9421337ac5 (patch)
tree319fd8c9e258caf876bfd2750c80eb981d970b6a /MAINTAINERS
parentfe2c802ab62aa63d276deafa905875f3455f2621 (diff)
parent85ba9d978d654b802d2ad46563cfb4b960eb1357 (diff)
downloadop-kernel-dev-ebaac8c9a5b9e8aeab4009cefcfc1e9421337ac5.zip
op-kernel-dev-ebaac8c9a5b9e8aeab4009cefcfc1e9421337ac5.tar.gz
Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-next
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 3 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index cd587ee..195c56f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2690,12 +2690,10 @@ L: libertas-dev@lists.infradead.org
S: Maintained
MARVELL MV643XX ETHERNET DRIVER
-P: Dale Farnsworth
-M: dale@farnsworth.org
-P: Manish Lachwani
-M: mlachwani@mvista.com
+P: Lennert Buytenhek
+M: buytenh@marvell.com
L: netdev@vger.kernel.org
-S: Odd Fixes for 2.4; Maintained for 2.6.
+S: Supported
MATROX FRAMEBUFFER DRIVER
P: Petr Vandrovec
OpenPOWER on IntegriCloud