diff --git a/[refs] b/[refs] index 27e0bf47f901..b88d519216d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f1c122ecfb046c8bac8d93cafc017d7b1aa21c9 +refs/heads/master: b60d6975e80ac69e4b797173857eeb5362e265a2 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6d1b048c62a1..ff16eac8cf5b 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1696,11 +1696,13 @@ M: mtk-manpages@gmx.net W: ftp://ftp.kernel.org/pub/linux/docs/manpages S: Maintained -MARVELL MV64340 ETHERNET DRIVER +MARVELL MV643XX ETHERNET DRIVER +P: Dale Farnsworth +M: dale@farnsworth.org P: Manish Lachwani -L: linux-mips@linux-mips.org +M: mlachwani@mvista.com L: netdev@vger.kernel.org -S: Supported +S: Odd Fixes for 2.4; Maintained for 2.6. MATROX FRAMEBUFFER DRIVER P: Petr Vandrovec