summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-08-12 14:45:06 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-08-12 14:45:06 -0400
commit89c2af3c14ddf8ae48637a7b454d66ac5e0ca728 (patch)
tree77faf3fc889fb0e77ce7c4778f2bbc93fdf8cdd2 /MAINTAINERS
parentf3dfd20860db3d0c400dd83a378176a28d3662db (diff)
parentd1e2586f484dfc36eee2b2d3a6c6c77be67ca492 (diff)
downloadop-kernel-dev-89c2af3c14ddf8ae48637a7b454d66ac5e0ca728.zip
op-kernel-dev-89c2af3c14ddf8ae48637a7b454d66ac5e0ca728.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts: drivers/net/ethernet/broadcom/Kconfig
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b57ecb1..9ee0a8f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4360,7 +4360,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
OpenPOWER on IntegriCloud