aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS14
1 files changed, 11 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4f96ac81089c..89ceb4005c5d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1120,7 +1120,6 @@ F: include/net/ax25.h
1120F: net/ax25/ 1120F: net/ax25/
1121 1121
1122B43 WIRELESS DRIVER 1122B43 WIRELESS DRIVER
1123M: Michael Buesch <mb@bu3sch.de>
1124M: Stefano Brivio <stefano.brivio@polimi.it> 1123M: Stefano Brivio <stefano.brivio@polimi.it>
1125L: linux-wireless@vger.kernel.org 1124L: linux-wireless@vger.kernel.org
1126W: http://linuxwireless.org/en/users/Drivers/b43 1125W: http://linuxwireless.org/en/users/Drivers/b43
@@ -2817,6 +2816,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
2817S: Supported 2816S: Supported
2818F: drivers/net/wireless/iwlwifi/ 2817F: drivers/net/wireless/iwlwifi/
2819 2818
2819INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
2820M: Samuel Ortiz <samuel.ortiz@intel.com>
2821M: Zhu Yi <yi.zhu@intel.com>
2822M: Intel Linux Wireless <ilw@linux.intel.com>
2823L: linux-wireless@vger.kernel.org
2824S: Supported
2825W: http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
2826F: drivers/net/wireless/iwmc3200wifi/
2827
2820IOC3 ETHERNET DRIVER 2828IOC3 ETHERNET DRIVER
2821M: Ralf Baechle <ralf@linux-mips.org> 2829M: Ralf Baechle <ralf@linux-mips.org>
2822L: linux-mips@linux-mips.org 2830L: linux-mips@linux-mips.org
@@ -3741,9 +3749,9 @@ F: include/linux/if_*
3741F: include/linux/*device.h 3749F: include/linux/*device.h
3742 3750
3743NETXEN (1/10) GbE SUPPORT 3751NETXEN (1/10) GbE SUPPORT
3744M: Dhananjay Phadke <dhananjay@netxen.com> 3752M: Amit Kumar Salecha <amit.salecha@qlogic.com>
3745L: netdev@vger.kernel.org 3753L: netdev@vger.kernel.org
3746W: http://www.netxen.com 3754W: http://www.qlogic.com
3747S: Supported 3755S: Supported
3748F: drivers/net/netxen/ 3756F: drivers/net/netxen/
3749 3757