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 75f771c8579f..4a5d67620a51 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1150,7 +1150,6 @@ F: include/net/ax25.h
1150F: net/ax25/ 1150F: net/ax25/
1151 1151
1152B43 WIRELESS DRIVER 1152B43 WIRELESS DRIVER
1153M: Michael Buesch <mb@bu3sch.de>
1154M: Stefano Brivio <stefano.brivio@polimi.it> 1153M: Stefano Brivio <stefano.brivio@polimi.it>
1155L: linux-wireless@vger.kernel.org 1154L: linux-wireless@vger.kernel.org
1156W: http://linuxwireless.org/en/users/Drivers/b43 1155W: http://linuxwireless.org/en/users/Drivers/b43
@@ -2847,6 +2846,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
2847S: Supported 2846S: Supported
2848F: drivers/net/wireless/iwlwifi/ 2847F: drivers/net/wireless/iwlwifi/
2849 2848
2849INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
2850M: Samuel Ortiz <samuel.ortiz@intel.com>
2851M: Zhu Yi <yi.zhu@intel.com>
2852M: Intel Linux Wireless <ilw@linux.intel.com>
2853L: linux-wireless@vger.kernel.org
2854S: Supported
2855W: http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
2856F: drivers/net/wireless/iwmc3200wifi/
2857
2850IOC3 ETHERNET DRIVER 2858IOC3 ETHERNET DRIVER
2851M: Ralf Baechle <ralf@linux-mips.org> 2859M: Ralf Baechle <ralf@linux-mips.org>
2852L: linux-mips@linux-mips.org 2860L: linux-mips@linux-mips.org
@@ -3771,9 +3779,9 @@ F: include/linux/if_*
3771F: include/linux/*device.h 3779F: include/linux/*device.h
3772 3780
3773NETXEN (1/10) GbE SUPPORT 3781NETXEN (1/10) GbE SUPPORT
3774M: Dhananjay Phadke <dhananjay@netxen.com> 3782M: Amit Kumar Salecha <amit.salecha@qlogic.com>
3775L: netdev@vger.kernel.org 3783L: netdev@vger.kernel.org
3776W: http://www.netxen.com 3784W: http://www.qlogic.com
3777S: Supported 3785S: Supported
3778F: drivers/net/netxen/ 3786F: drivers/net/netxen/
3779 3787