Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --cc MAINTAINERS
index 194095a,c66c093..579713e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4501,8 -4490,19 +4501,19 @@@ M:    Rajesh Borundia <rajesh.borundia@qlo
  L:    netdev@vger.kernel.org
  W:    http://www.qlogic.com
  S:    Supported
 -F:    drivers/net/netxen/
 +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

diff --cc drivers/net/wireless/ath/ath9k/ar9003_phy.h
Simple merge

diff --cc drivers/net/wireless/b43/dma.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/mesh_pathtbl.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge