iwlagn: move iwl_enable_rfkill_int and kill iwl-helpers.h

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1d2e79d..a31c614 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1230,7 +1230,7 @@ F:        Documentation/aoe/
 F:     drivers/block/aoe/
 
 ATHEROS ATH GENERIC UTILITIES
-M:     "Luis R. Rodriguez" <lrodriguez@atheros.com>
+M:     "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
 L:     linux-wireless@vger.kernel.org
 S:     Supported
 F:     drivers/net/wireless/ath/*
@@ -1238,7 +1238,7 @@ F:        drivers/net/wireless/ath/*
 ATHEROS ATH5K WIRELESS DRIVER
 M:     Jiri Slaby <jirislaby@gmail.com>
 M:     Nick Kossifidis <mickflemm@gmail.com>
-M:     "Luis R. Rodriguez" <lrodriguez@atheros.com>
+M:     "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
 M:     Bob Copeland <me@bobcopeland.com>
 L:     linux-wireless@vger.kernel.org
 L:     ath5k-devel@lists.ath5k.org
@@ -1246,11 +1246,19 @@ W:      http://wireless.kernel.org/en/users/Drivers/ath5k
 S:     Maintained
 F:     drivers/net/wireless/ath/ath5k/
 
+ATHEROS ATH6KL WIRELESS DRIVER
+M:     Kalle Valo <kvalo@qca.qualcomm.com>
+L:     linux-wireless@vger.kernel.org
+W:     http://wireless.kernel.org/en/users/Drivers/ath6kl
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git
+S:     Supported
+F:     drivers/net/wireless/ath/ath6kl/
+
 ATHEROS ATH9K WIRELESS DRIVER
-M:     "Luis R. Rodriguez" <lrodriguez@atheros.com>
-M:     Jouni Malinen <jmalinen@atheros.com>
-M:     Vasanthakumar Thiagarajan <vasanth@atheros.com>
-M:     Senthil Balasubramanian <senthilkumar@atheros.com>
+M:     "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
+M:     Jouni Malinen <jouni@qca.qualcomm.com>
+M:     Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
+M:     Senthil Balasubramanian <senthilb@qca.qualcomm.com>
 L:     linux-wireless@vger.kernel.org
 L:     ath9k-devel@lists.ath9k.org
 W:     http://wireless.kernel.org/en/users/Drivers/ath9k
@@ -1278,7 +1286,7 @@ F:        drivers/input/misc/ati_remote2.c
 ATLX ETHERNET DRIVERS
 M:     Jay Cliburn <jcliburn@gmail.com>
 M:     Chris Snook <chris.snook@gmail.com>
-M:     Jie Yang <jie.yang@atheros.com>
+M:     Jie Yang <yangjie@qca.qualcomm.com>
 L:     netdev@vger.kernel.org
 W:     http://sourceforge.net/projects/atl1
 W:     http://atl1.sourceforge.net
@@ -3405,7 +3413,7 @@ M:        Wey-Yi Guy <wey-yi.w.guy@intel.com>
 M:     Intel Linux Wireless <ilw@linux.intel.com>
 L:     linux-wireless@vger.kernel.org
 W:     http://intellinuxwireless.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
 S:     Supported
 F:     drivers/net/wireless/iwlwifi/
 
@@ -4492,6 +4500,17 @@ W:       http://www.qlogic.com
 S:     Supported
 F:     drivers/net/netxen/
 
+NFC SUBSYSTEM
+M:     Lauro Ramos Venancio <lauro.venancio@openbossa.org>
+M:     Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
+M:     Samuel Ortiz <sameo@linux.intel.com>
+L:     linux-wireless@vger.kernel.org
+S:     Maintained
+F:     net/nfc/
+F:     include/linux/nfc.h
+F:     include/net/nfc/
+F:     drivers/nfc/
+
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:     Trond Myklebust <Trond.Myklebust@netapp.com>
 L:     linux-nfs@vger.kernel.org
@@ -6111,12 +6130,6 @@ M:       Jakub Schmidtke <sjakub@gmail.com>
 S:     Odd Fixes
 F:     drivers/staging/asus_oled/
 
-STAGING - ATHEROS ATH6KL WIRELESS DRIVER
-M:     Luis R. Rodriguez <mcgrof@gmail.com>
-M:     Naveen Singh <nsingh@atheros.com>
-S:     Odd Fixes
-F:     drivers/staging/ath6kl/
-
 STAGING - COMEDI
 M:     Ian Abbott <abbotti@mev.co.uk>
 M:     Mori Hess <fmhess@users.sourceforge.net>