commit 82740b9ac2fbd935361c1dc770ec49b692c28e7d
author David S. Miller <davem@davemloft.net> Wed Apr 08 17:12:50 2015 -0400
committer David S. Miller <davem@davemloft.net> Wed Apr 08 17:12:50 2015 -0400
tree 484bd5cfea3461fbd7c5aa203f4a06a1d8a5d88c
parent 51df60f5a428c249cd458451e0b56269417f3cda
parent 3590ebc040c9ee5d06754ce926f0e7c3a595e46d

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

Samuel Ortiz says:

====================
NFC: 4.1 pull request

This is the NFC pull request for 4.1.

This is a shorter one than usual, as the Intel Field Peak NFC
driver could not make it in time.

We have:

- A new driver for NXP NCI based chipsets, like e.g. the NPC100 or
  the PN7150. It currently only supports an i2c physical layer, but
  could easily be extended to work on top of e.g. SPI.
  This driver also includes support for user space triggered firmware
  updates.

- A few minor st21nfc[ab] fixes, cleanups, and comments improvements.

- A pn533 error return fix.

- A few NFC related logs formatting cleanups.
====================

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