aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS14
1 files changed, 5 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9b55c661c3fb..8d3a91f4ba4a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2653,25 +2653,21 @@ F: drivers/net/ixgbe/
2653 2653
2654INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT 2654INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
2655M: Zhu Yi <yi.zhu@intel.com> 2655M: Zhu Yi <yi.zhu@intel.com>
2656M: James Ketrenos <jketreno@linux.intel.com>
2657M: Reinette Chatre <reinette.chatre@intel.com> 2656M: Reinette Chatre <reinette.chatre@intel.com>
2657M: Intel Linux Wireless <ilw@linux.intel.com>
2658L: linux-wireless@vger.kernel.org 2658L: linux-wireless@vger.kernel.org
2659L: ipw2100-devel@lists.sourceforge.net
2660W: http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
2661W: http://ipw2100.sourceforge.net 2659W: http://ipw2100.sourceforge.net
2662S: Supported 2660S: Odd Fixes
2663F: Documentation/networking/README.ipw2100 2661F: Documentation/networking/README.ipw2100
2664F: drivers/net/wireless/ipw2x00/ipw2100.* 2662F: drivers/net/wireless/ipw2x00/ipw2100.*
2665 2663
2666INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT 2664INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
2667M: Zhu Yi <yi.zhu@intel.com> 2665M: Zhu Yi <yi.zhu@intel.com>
2668M: James Ketrenos <jketreno@linux.intel.com>
2669M: Reinette Chatre <reinette.chatre@intel.com> 2666M: Reinette Chatre <reinette.chatre@intel.com>
2667M: Intel Linux Wireless <ilw@linux.intel.com>
2670L: linux-wireless@vger.kernel.org 2668L: linux-wireless@vger.kernel.org
2671L: ipw2100-devel@lists.sourceforge.net
2672W: http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
2673W: http://ipw2200.sourceforge.net 2669W: http://ipw2200.sourceforge.net
2674S: Supported 2670S: Odd Fixes
2675F: Documentation/networking/README.ipw2200 2671F: Documentation/networking/README.ipw2200
2676F: drivers/net/wireless/ipw2x00/ipw2200.* 2672F: drivers/net/wireless/ipw2x00/ipw2200.*
2677 2673
@@ -2688,8 +2684,8 @@ F: include/linux/wimax/i2400m.h
2688INTEL WIRELESS WIFI LINK (iwlwifi) 2684INTEL WIRELESS WIFI LINK (iwlwifi)
2689M: Zhu Yi <yi.zhu@intel.com> 2685M: Zhu Yi <yi.zhu@intel.com>
2690M: Reinette Chatre <reinette.chatre@intel.com> 2686M: Reinette Chatre <reinette.chatre@intel.com>
2687M: Intel Linux Wireless <ilw@linux.intel.com>
2691L: linux-wireless@vger.kernel.org 2688L: linux-wireless@vger.kernel.org
2692L: ipw3945-devel@lists.sourceforge.net
2693W: http://intellinuxwireless.org 2689W: http://intellinuxwireless.org
2694T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git 2690T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
2695S: Supported 2691S: Supported