qed: Add module with basic common support

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b8577ad..219c789 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5561,7 +5561,7 @@ F:        drivers/net/wireless/iwlegacy/
 INTEL WIRELESS WIFI LINK (iwlwifi)
 M:     Johannes Berg <johannes.berg@intel.com>
 M:     Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-M:     Intel Linux Wireless <ilw@linux.intel.com>
+M:     Intel Linux Wireless <linuxwifi@intel.com>
 L:     linux-wireless@vger.kernel.org
 W:     http://intellinuxwireless.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
@@ -6108,6 +6108,13 @@ F:       Documentation/auxdisplay/ks0108
 F:     drivers/auxdisplay/ks0108.c
 F:     include/linux/ks0108.h
 
+L3MDEV
+M:     David Ahern <dsa@cumulusnetworks.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     net/l3mdev
+F:     include/net/l3mdev.h
+
 LAPB module
 L:     linux-x25@vger.kernel.org
 S:     Orphan
@@ -6793,7 +6800,6 @@ F:        drivers/scsi/megaraid/
 
 MELLANOX ETHERNET DRIVER (mlx4_en)
 M:     Amir Vadai <amirv@mellanox.com>
-M:     Ido Shamay <idos@mellanox.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 W:     http://www.mellanox.com
@@ -6986,6 +6992,7 @@ M:        Alan Ott <alan@signal11.us>
 L:     linux-wpan@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ieee802154/mrf24j40.c
+F:     Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
 
 MSI LAPTOP SUPPORT
 M:     "Lee, Chun-Yi" <jlee@suse.com>
@@ -7320,7 +7327,6 @@ S:        Odd Fixes
 F:     drivers/net/
 F:     include/linux/if_*
 F:     include/linux/netdevice.h
-F:     include/linux/arcdevice.h
 F:     include/linux/etherdevice.h
 F:     include/linux/fcdevice.h
 F:     include/linux/fddidevice.h
@@ -8534,6 +8540,16 @@ L:       netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/qlogic/qlge/
 
+QLOGIC QL4xxx ETHERNET DRIVER
+M:     Yuval Mintz <Yuval.Mintz@qlogic.com>
+M:     Ariel Elior <Ariel.Elior@qlogic.com>
+M:     everest-linux-l2@qlogic.com
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/qlogic/qed/
+F:     include/linux/qed/
+F:     drivers/net/ethernet/qlogic/qede/
+
 QNX4 FILESYSTEM
 M:     Anders Larsen <al@alarsen.net>
 W:     http://www.alarsen.net/linux/qnx4fs/
@@ -11288,7 +11304,6 @@ M:      Shrijeet Mukherjee <shm@cumulusnetworks.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/vrf.c
-F:     include/net/vrf.h
 F:     Documentation/networking/vrf.txt
 
 VT1211 HARDWARE MONITOR DRIVER