Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-next (ebaac8c9) · Commits · e / devices / android_kernel_teracube_2e

MAINTAINERS

+3 −5

Original line number	Diff line number	Diff line
		@@ -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