diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-05-18 09:56:15 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-05-18 09:56:15 +1000 |
commit | 99e721777f37cab212fb27fb50703335d031d9b2 (patch) | |
tree | 2863004b5c4fb00779ea05939b8d38f644073a61 /MAINTAINERS | |
parent | 586cf328ff7e7c0c32f89d6f2063c81143802c01 (diff) | |
parent | 52776a700b53969345a3cc5daed1c797d016a188 (diff) |
Merge remote-tracking branch 'wireless-drivers-next/master'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4dba927f13c9..6d45d959c5df 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5896,6 +5896,7 @@ F: drivers/net/wireless/intel/iwlegacy/ INTEL WIRELESS WIFI LINK (iwlwifi) M: Johannes Berg <johannes.berg@intel.com> M: Emmanuel Grumbach <emmanuel.grumbach@intel.com> +M: Luca Coelho <luciano.coelho@intel.com> M: Intel Linux Wireless <linuxwifi@intel.com> L: linux-wireless@vger.kernel.org W: http://intellinuxwireless.org |