diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-02 21:37:34 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-02 21:37:34 +0200 |
| commit | 204162296edf0d0ac3e4dfd5bd0cac4af731b583 (patch) | |
| tree | fdf941fd23fae6097500db4998d4ca96467fc352 /MAINTAINERS | |
| parent | ath9k: Add statistics for antenna diversity (diff) | |
| parent | iwlwifi: mvm: advertise support for DYNAMIC / STATIC SMPS (diff) | |
| download | linux-204162296edf0d0ac3e4dfd5bd0cac4af731b583.tar.xz linux-204162296edf0d0ac3e4dfd5bd0cac4af731b583.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7a403ba167d2..2a3faf5b8301 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4362,7 +4362,7 @@ F: drivers/net/wireless/iwlegacy/ INTEL WIRELESS WIFI LINK (iwlwifi) M: Johannes Berg <johannes.berg@intel.com> -M: Wey-Yi Guy <wey-yi.w.guy@intel.com> +M: Emmanuel Grumbach <emmanuel.grumbach@intel.com> M: Intel Linux Wireless <ilw@linux.intel.com> L: linux-wireless@vger.kernel.org W: http://intellinuxwireless.org |