Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c77a0ef..f00d2c5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -154,6 +154,7 @@ L:  linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
 L:     linux-bluetooth@vger.kernel.org
 S:     Maintained
 F:     net/6lowpan/
+F:     include/net/6lowpan.h
 
 6PACK NETWORK DRIVER FOR AX.25
 M:     Andreas Koensgen <ajk@comnets.uni-bremen.de>
@@ -5714,7 +5715,8 @@ S:        Maintained
 F:     drivers/net/ethernet/marvell/mvneta.*
 
 MARVELL MWIFIEX WIRELESS DRIVER
-M:     Bing Zhao <bzhao@marvell.com>
+M:     Amitkumar Karwar <akarwar@marvell.com>
+M:     Avinash Patil <patila@marvell.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wireless/mwifiex/