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) | |
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 | |||
| 2690 | S: Maintained | 2690 | S: Maintained |
| 2691 | 2691 | ||
| 2692 | MARVELL MV643XX ETHERNET DRIVER | 2692 | MARVELL MV643XX ETHERNET DRIVER |
| 2693 | P: Dale Farnsworth | 2693 | P: Lennert Buytenhek |
| 2694 | M: dale@farnsworth.org | 2694 | M: buytenh@marvell.com |
| 2695 | P: Manish Lachwani | ||
| 2696 | M: mlachwani@mvista.com | ||
| 2697 | L: netdev@vger.kernel.org | 2695 | L: netdev@vger.kernel.org |
| 2698 | S: Odd Fixes for 2.4; Maintained for 2.6. | 2696 | S: Supported |
| 2699 | 2697 | ||
| 2700 | MATROX FRAMEBUFFER DRIVER | 2698 | MATROX FRAMEBUFFER DRIVER |
| 2701 | P: Petr Vandrovec | 2699 | P: Petr Vandrovec |