Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

1 files changed, 18 insertions, 7 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 194095ac07ec..579713ef7cfb 100644
--- 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
@@ -1247,10 +1247,10 @@ S:	Maintained
 F:      drivers/net/wireless/ath/ath5k/
 
 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 +1278,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
@@ -4503,6 +4503,17 @@ W:	http://www.qlogic.com
 S:      Supported
 F:      drivers/net/ethernet/qlogic/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.h
+F:      drivers/nfc/
+
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:      Trond Myklebust <Trond.Myklebust@netapp.com>
 L:      linux-nfs@vger.kernel.org