summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-07-23 14:03:39 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-07-31 11:05:06 +0200
commit6161b02b934bcf013f3bd7468222e24d4d597fbf (patch)
tree64d968efd8d9d183247e3300f7b2704dabf12553 /MAINTAINERS
parentiwlwifi: mvm: Change beacon abort escape time value (diff)
downloadlinux-6161b02b934bcf013f3bd7468222e24d4d597fbf.tar.xz
linux-6161b02b934bcf013f3bd7468222e24d4d597fbf.zip
iwlwifi: list Emmanuel in maintainers file
Wey-Yi has moved on a while ago, but we forgot to update the maintainers file. Since Emmanuel is de facto maintaining the driver along with myself now, list him instead. Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index bf61e04291ab..d44a5e8745db 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