diff options
author | Jeff Garzik <jeff@garzik.org> | 2008-06-17 23:24:19 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-06-17 23:24:19 -0400 |
commit | ebaac8c9a5b9e8aeab4009cefcfc1e9421337ac5 (patch) | |
tree | 319fd8c9e258caf876bfd2750c80eb981d970b6a /MAINTAINERS | |
parent | fe2c802ab62aa63d276deafa905875f3455f2621 (diff) | |
parent | 85ba9d978d654b802d2ad46563cfb4b960eb1357 (diff) | |
download | blackbird-op-linux-ebaac8c9a5b9e8aeab4009cefcfc1e9421337ac5.tar.gz blackbird-op-linux-ebaac8c9a5b9e8aeab4009cefcfc1e9421337ac5.zip |
Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-next
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cd587eec9fa7..195c56fc0db7 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 |