summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-04-18 21:37:33 +0400
committerJohn W. Linville <linville@tuxdriver.com>2012-04-18 21:37:33 +0400
commitdbd717e37bf1409fd250d13aef2cab07bcae8c88 (patch)
tree1e8c0b94388bf7a5822a49ff3c47bddc06382c2b /MAINTAINERS
parent9fe5642f4a3b13beb43c2633db7df22dd9d99250 (diff)
parentfd09c85fe15aa66a69f091ba178817d5ef82476d (diff)
downloadlinux-dbd717e37bf1409fd250d13aef2cab07bcae8c88.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7cef7be8f840..f11ac47390d8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3592,6 +3592,7 @@ S: Supported
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: Intel Linux Wireless <ilw@linux.intel.com>
L: linux-wireless@vger.kernel.org