From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 29 Aug 2011 18:52:20 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.2-rc1~129^2~353^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ba6e5eb107b4b26444cb67ce6fb8eb0973a97964

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

ba6e5eb107b4b26444cb67ce6fb8eb0973a97964
diff --cc MAINTAINERS
index 194095ac07ec,c66c093978d7..579713ef7cfb
--- a/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