summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2012-11-21 19:48:03 +0000
committerJason Cooper <jason@lakedaemon.net>2012-11-21 19:48:03 +0000
commit4135c7d4a74c6b796277e6c090c70e960254014e (patch)
tree8ca4e0254974ad13dbc95b85b594e3ee70905392 /MAINTAINERS
parentbcd731e1ed540001c4bb71dfda63cc0c3d67ead2 (diff)
parent370b8ed905aa0c03125635169b6bcb69c3a91cdf (diff)
downloadlinux-3.10-4135c7d4a74c6b796277e6c090c70e960254014e.tar.gz
linux-3.10-4135c7d4a74c6b796277e6c090c70e960254014e.tar.bz2
linux-3.10-4135c7d4a74c6b796277e6c090c70e960254014e.zip
Merge tag 'marvell-neta-for-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything
Marvell mvneta network driver, for 3.8
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index bb0b27db673..b72fbe26996 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4749,6 +4749,12 @@ S: Maintained
F: drivers/net/ethernet/marvell/mv643xx_eth.*
F: include/linux/mv643xx.h
+MARVELL MVNETA ETHERNET DRIVER
+M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+L: netdev@vger.kernel.org
+S: Maintained
+F: drivers/net/ethernet/marvell/mvneta.*
+
MARVELL MWIFIEX WIRELESS DRIVER
M: Bing Zhao <bzhao@marvell.com>
L: linux-wireless@vger.kernel.org