From: David S. Miller <davem@davemloft.net>
Date: Fri, 21 Apr 2017 19:29:40 +0000 (-0400)
Subject: Merge tag 'nfc-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... 
X-Git-Tag: android-x86-8.1-r1~3658^2~129
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=69e3948aaa559670da2662ad9d5cbc782bfc6885;p=android-x86%2Fkernel.git

Merge tag 'nfc-next-4.12-1' of git://git./linux/kernel/git/sameo/nfc-next

Samuel Ortiz says:

====================
NFC 4.12 pull request

This is the NFC pull request for 4.12. We have:

- Improvements for the pn533 command queue handling and device
  registration order.
- Removal of platform data for the pn544 and st21nfca drivers.
- Additional device tree options to support more trf7970a hardware options.
- Support for Sony's RC-S380P through the port100 driver.
- Removal of the obsolte nfcwilink driver.
- Headers inclusion cleanups (miscdevice.h, unaligned.h) for many drivers.
====================

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

69e3948aaa559670da2662ad9d5cbc782bfc6885