diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-18 13:37:33 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-18 13:37:33 -0400 |
| commit | dbd717e37bf1409fd250d13aef2cab07bcae8c88 (patch) | |
| tree | 1e8c0b94388bf7a5822a49ff3c47bddc06382c2b /MAINTAINERS | |
| parent | 9fe5642f4a3b13beb43c2633db7df22dd9d99250 (diff) | |
| parent | fd09c85fe15aa66a69f091ba178817d5ef82476d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7cef7be8f840..f11ac47390d8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3592,6 +3592,7 @@ S: Supported | |||
| 3592 | F: drivers/net/wireless/iwlegacy/ | 3592 | F: drivers/net/wireless/iwlegacy/ |
| 3593 | 3593 | ||
| 3594 | INTEL WIRELESS WIFI LINK (iwlwifi) | 3594 | INTEL WIRELESS WIFI LINK (iwlwifi) |
| 3595 | M: Johannes Berg <johannes.berg@intel.com> | ||
| 3595 | M: Wey-Yi Guy <wey-yi.w.guy@intel.com> | 3596 | M: Wey-Yi Guy <wey-yi.w.guy@intel.com> |
| 3596 | M: Intel Linux Wireless <ilw@linux.intel.com> | 3597 | M: Intel Linux Wireless <ilw@linux.intel.com> |
| 3597 | L: linux-wireless@vger.kernel.org | 3598 | L: linux-wireless@vger.kernel.org |