Merge tag 'nfc-next-4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...

Samuel Ortiz says:

====================
NFC 4.13 pull request

This is the NFC pull requesy for 4.13. We have:

- A conversion to unified device and GPIO APIs for the
  fdp, pn544, and st{21,-nci} drivers.
- A fix for NFC device IDs allocation.
- A fix for the nfcmrvl driver firmware download mechanism.
- A trf7970a DT and GPIO cleanup and clock setting fix.
- A few fixes for potential overflows in the digital and LLCP code.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --combined MAINTAINERS
index 8e9495a7d74296de85cff684a322fb426c40ef25,b416d381589d09750f4542f43063e5228f3e987c..5bebe20811c4562b655491328a515ab3b82c2f31
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2785,11 -2785,8 +2785,11 @@@ BROADCOM BRCM80211 IEEE802.11n WIRELES
  M:    Arend van Spriel <arend.vanspriel@broadcom.com>
  M:    Franky Lin <franky.lin@broadcom.com>
  M:    Hante Meuleman <hante.meuleman@broadcom.com>
 +M:    Chi-Hsien Lin <chi-hsien.lin@cypress.com>
 +M:    Wright Feng <wright.feng@cypress.com>
  L:    linux-wireless@vger.kernel.org
  L:    brcm80211-dev-list.pdl@broadcom.com
 +L:    brcm80211-dev-list@cypress.com
  S:    Supported
  F:    drivers/net/wireless/broadcom/brcm80211/
  
@@@ -2967,7 -2964,7 +2967,7 @@@ F:      sound/pci/oxygen
  
  C6X ARCHITECTURE
  M:    Mark Salter <msalter@redhat.com>
 -M:    Aurelien Jacquiot <a-jacquiot@ti.com>
 +M:    Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
  L:    linux-c6x-dev@linux-c6x.org
  W:    http://www.linux-c6x.org/wiki/index.php/Main_Page
  S:    Maintained
@@@ -8330,16 -8327,6 +8330,16 @@@ Q:    http://patchwork.ozlabs.org/project/
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
  
 +MELLANOX ETHERNET INNOVA IPSEC DRIVER
 +M:    Ilan Tayari <ilant@mellanox.com>
 +R:    Boris Pismenny <borisp@mellanox.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +F:    drivers/net/ethernet/mellanox/mlx5/core/en_ipsec/*
 +F:    drivers/net/ethernet/mellanox/mlx5/core/ipsec*
 +
  MELLANOX ETHERNET SWITCH DRIVERS
  M:    Jiri Pirko <jiri@mellanox.com>
  M:    Ido Schimmel <idosch@mellanox.com>
@@@ -9082,9 -9069,6 +9082,6 @@@ F:      include/uapi/linux/nfc.
  F:    drivers/nfc/
  F:    include/linux/platform_data/nfcmrvl.h
  F:    include/linux/platform_data/nxp-nci.h
- F:    include/linux/platform_data/pn544.h
- F:    include/linux/platform_data/st21nfca.h
- F:    include/linux/platform_data/st-nci.h
  F:    Documentation/devicetree/bindings/net/nfc/
  
  NFS, SUNRPC, AND LOCKD CLIENTS
@@@ -11419,6 -11403,14 +11416,14 @@@ F: kernel/time/alarmtimer.
  F:    kernel/time/ntp.c
  F:    tools/testing/selftests/timers/
  
+ TI TRF7970A NFC DRIVER
+ M:    Mark Greer <mgreer@animalcreek.com>
+ L:    linux-wireless@vger.kernel.org
+ L:    linux-nfc@lists.01.org (moderated for non-subscribers)
+ S:    Supported
+ F:    drivers/nfc/trf7970a.c
+ F:    Documentation/devicetree/bindings/net/nfc/trf7970a.txt
+ 
  SC1200 WDT DRIVER
  M:    Zwane Mwaikambo <zwanem@gmail.com>
  S:    Maintained