diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-26 14:49:49 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-26 14:49:49 -0500 |
| commit | 9b6941d8b103fe95d1a90b7996046be9ee0e55e4 (patch) | |
| tree | 03c4e26abb8d6212741c3821061f2f40f2b5c8ec /MAINTAINERS | |
| parent | de221bd5eb5e754806fcc39c40bb12b96515d9c5 (diff) | |
| parent | acd9f9cc305ca2e5da2a39f6f6160cd4b476e38b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cf0f3a5c09cc..9d12977b6baf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3327,7 +3327,6 @@ F: drivers/net/wimax/i2400m/ | |||
| 3327 | F: include/linux/wimax/i2400m.h | 3327 | F: include/linux/wimax/i2400m.h |
| 3328 | 3328 | ||
| 3329 | INTEL WIRELESS WIFI LINK (iwlwifi) | 3329 | INTEL WIRELESS WIFI LINK (iwlwifi) |
| 3330 | M: Reinette Chatre <reinette.chatre@intel.com> | ||
| 3331 | M: Wey-Yi Guy <wey-yi.w.guy@intel.com> | 3330 | M: Wey-Yi Guy <wey-yi.w.guy@intel.com> |
| 3332 | M: Intel Linux Wireless <ilw@linux.intel.com> | 3331 | M: Intel Linux Wireless <ilw@linux.intel.com> |
| 3333 | L: linux-wireless@vger.kernel.org | 3332 | L: linux-wireless@vger.kernel.org |