summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2015-10-07 11:14:23 +0200
committerKalle Valo <kvalo@codeaurora.org>2015-10-07 11:14:23 +0200
commit7e64e5e66af8308725bfd03fcdf185c09b3056a7 (patch)
tree8d3839ecec9f1e743f3b3289ecd42b8e5195c22b /MAINTAINERS
parentMerge ath-next from ath.git (diff)
parentiwlwifi: mvm: add minimal multi-RXQ infrastructure (diff)
downloadlinux-7e64e5e66af8308725bfd03fcdf185c09b3056a7.tar.xz
linux-7e64e5e66af8308725bfd03fcdf185c09b3056a7.zip
Merge tag 'iwlwifi-next-for-kalle-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* more clean-ups towards multiple RX queues; * some rate scaling fixes and improvements; * some time-of-flight fixes; * other generic improvements and clean-ups;
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 310da4295c70..77b2728ca506 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5541,7 +5541,7 @@ F: drivers/net/wireless/iwlegacy/
INTEL WIRELESS WIFI LINK (iwlwifi)
M: Johannes Berg <johannes.berg@intel.com>
M: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-M: Intel Linux Wireless <ilw@linux.intel.com>
+M: Intel Linux Wireless <linuxwifi@intel.com>
L: linux-wireless@vger.kernel.org
W: http://intellinuxwireless.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git