diff options
author | Jason Cooper <jason@lakedaemon.net> | 2012-11-21 14:48:03 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-21 14:48:03 -0500 |
commit | 4135c7d4a74c6b796277e6c090c70e960254014e (patch) | |
tree | 8ca4e0254974ad13dbc95b85b594e3ee70905392 /MAINTAINERS | |
parent | bcd731e1ed540001c4bb71dfda63cc0c3d67ead2 (diff) | |
parent | 370b8ed905aa0c03125635169b6bcb69c3a91cdf (diff) |
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-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bb0b27db673f..b72fbe269960 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4749,6 +4749,12 @@ S: Maintained | |||
4749 | F: drivers/net/ethernet/marvell/mv643xx_eth.* | 4749 | F: drivers/net/ethernet/marvell/mv643xx_eth.* |
4750 | F: include/linux/mv643xx.h | 4750 | F: include/linux/mv643xx.h |
4751 | 4751 | ||
4752 | MARVELL MVNETA ETHERNET DRIVER | ||
4753 | M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | ||
4754 | L: netdev@vger.kernel.org | ||
4755 | S: Maintained | ||
4756 | F: drivers/net/ethernet/marvell/mvneta.* | ||
4757 | |||
4752 | MARVELL MWIFIEX WIRELESS DRIVER | 4758 | MARVELL MWIFIEX WIRELESS DRIVER |
4753 | M: Bing Zhao <bzhao@marvell.com> | 4759 | M: Bing Zhao <bzhao@marvell.com> |
4754 | L: linux-wireless@vger.kernel.org | 4760 | L: linux-wireless@vger.kernel.org |