Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0ff630d..6b880de 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2308,6 +2308,14 @@ F:       security/capability.c
 F:     security/commoncap.c
 F:     kernel/capability.c
 
+CC2520 IEEE-802.15.4 RADIO DRIVER
+M:     Varka Bhadram <varkabhadram@gmail.com>
+L:     linux-wpan@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ieee802154/cc2520.c
+F:     include/linux/spi/cc2520.h
+F:     Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
+
 CELL BROADBAND ENGINE ARCHITECTURE
 M:     Arnd Bergmann <arnd@arndb.de>
 L:     linuxppc-dev@lists.ozlabs.org
@@ -4713,6 +4721,13 @@ S:       Maintained
 F:     net/ieee802154/
 F:     net/mac802154/
 F:     drivers/net/ieee802154/
+F:     include/linux/nl802154.h
+F:     include/linux/ieee802154.h
+F:     include/net/nl802154.h
+F:     include/net/mac802154.h
+F:     include/net/af_ieee802154.h
+F:     include/net/cfg802154.h
+F:     include/net/ieee802154_netdev.h
 F:     Documentation/networking/ieee802154.txt
 
 IGUANAWORKS USB IR TRANSCEIVER
@@ -5881,6 +5896,11 @@ M:       Russell King <rmk+kernel@arm.linux.org.uk>
 S:     Maintained
 F:     drivers/gpu/drm/armada/
 
+MARVELL 88E6352 DSA support
+M:     Guenter Roeck <linux@roeck-us.net>
+S:     Maintained
+F:     drivers/net/dsa/mv88e6352.c
+
 MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
 M:     Mirko Lindner <mlindner@marvell.com>
 M:     Stephen Hemminger <stephen@networkplumber.org>