diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 13608bd2e791..0924a76da873 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2978,7 +2978,6 @@ F: drivers/net/ixgb/ | |||
2978 | F: drivers/net/ixgbe/ | 2978 | F: drivers/net/ixgbe/ |
2979 | 2979 | ||
2980 | INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT | 2980 | INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT |
2981 | M: Zhu Yi <yi.zhu@intel.com> | ||
2982 | M: Reinette Chatre <reinette.chatre@intel.com> | 2981 | M: Reinette Chatre <reinette.chatre@intel.com> |
2983 | M: Intel Linux Wireless <ilw@linux.intel.com> | 2982 | M: Intel Linux Wireless <ilw@linux.intel.com> |
2984 | L: linux-wireless@vger.kernel.org | 2983 | L: linux-wireless@vger.kernel.org |
@@ -2988,7 +2987,6 @@ F: Documentation/networking/README.ipw2100 | |||
2988 | F: drivers/net/wireless/ipw2x00/ipw2100.* | 2987 | F: drivers/net/wireless/ipw2x00/ipw2100.* |
2989 | 2988 | ||
2990 | INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT | 2989 | INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT |
2991 | M: Zhu Yi <yi.zhu@intel.com> | ||
2992 | M: Reinette Chatre <reinette.chatre@intel.com> | 2990 | M: Reinette Chatre <reinette.chatre@intel.com> |
2993 | M: Intel Linux Wireless <ilw@linux.intel.com> | 2991 | M: Intel Linux Wireless <ilw@linux.intel.com> |
2994 | L: linux-wireless@vger.kernel.org | 2992 | L: linux-wireless@vger.kernel.org |
@@ -3019,8 +3017,8 @@ F: drivers/net/wimax/i2400m/ | |||
3019 | F: include/linux/wimax/i2400m.h | 3017 | F: include/linux/wimax/i2400m.h |
3020 | 3018 | ||
3021 | INTEL WIRELESS WIFI LINK (iwlwifi) | 3019 | INTEL WIRELESS WIFI LINK (iwlwifi) |
3022 | M: Zhu Yi <yi.zhu@intel.com> | ||
3023 | M: Reinette Chatre <reinette.chatre@intel.com> | 3020 | M: Reinette Chatre <reinette.chatre@intel.com> |
3021 | M: Wey-Yi Guy <wey-yi.w.guy@intel.com> | ||
3024 | M: Intel Linux Wireless <ilw@linux.intel.com> | 3022 | M: Intel Linux Wireless <ilw@linux.intel.com> |
3025 | L: linux-wireless@vger.kernel.org | 3023 | L: linux-wireless@vger.kernel.org |
3026 | W: http://intellinuxwireless.org | 3024 | W: http://intellinuxwireless.org |
@@ -3030,7 +3028,6 @@ F: drivers/net/wireless/iwlwifi/ | |||
3030 | 3028 | ||
3031 | INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi) | 3029 | INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi) |
3032 | M: Samuel Ortiz <samuel.ortiz@intel.com> | 3030 | M: Samuel Ortiz <samuel.ortiz@intel.com> |
3033 | M: Zhu Yi <yi.zhu@intel.com> | ||
3034 | M: Intel Linux Wireless <ilw@linux.intel.com> | 3031 | M: Intel Linux Wireless <ilw@linux.intel.com> |
3035 | L: linux-wireless@vger.kernel.org | 3032 | L: linux-wireless@vger.kernel.org |
3036 | S: Supported | 3033 | S: Supported |