summary refs log tree commit diff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2016-05-11 20:54:07 +0300
committerKalle Valo <kvalo@codeaurora.org>2016-05-11 20:54:07 +0300
commit2befc4e003a6093db8dce34c7dc9dee8426c973b (patch)
tree9c6ddb29aa390dc671b7c68dd2b4e6bb1264204d /MAINTAINERS
parent251a9605ab882998009002bf1f5176a049beba53 (diff)
parentaf5e964f3045b66f1cd720b9c5abd37e47e613e2 (diff)
downloadlinux-2befc4e003a6093db8dce34c7dc9dee8426c973b.tar.gz
Merge tag 'iwlwifi-next-for-kalle-2016-05-10' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* work for RX multiqueue continues (Sara);
* dynamic queue allocation work continues (Liad);
* add Luca as maintainer;
* a bunch of fixes and improvements all over;
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ab008013cfec..ee2fad5626ec 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5831,6 +5831,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