From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 22 Apr 2013 18:54:31 +0000 (-0400)
Subject: Merge tag 'nfc-next-3.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=197bbf0aedfb81ab70247264883c81e7f7d503ba;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'nfc-next-3.10-2' of git://git./linux/kernel/git/sameo/nfc-next

Samuel Ortiz <sameo@linux.intel.com> says:

"This is the 2nd NFC pull request for 3.10.

With this one we have:

- A major pn533 update. The pn533 framing support has been changed in order to
  easily support all pn533 derivatives. For example we now support the ACR122
  USB dongle.

- An NFC MEI physical layer code factorization through the mei_phy NFC API.
  Both the microread and the pn544 drivers now use it.

- LLCP aggregation support. This allows NFC p2p devices to send aggregated
  frames containing all sort of LLCP frames except SYMM and aggregation
  frames.

- More LLCP socket options for getting the remote device link parameters.

- Fixes for the LLCP socket option code added with the first pull request for
  3.10.

- Some support for LLCP corner cases like 0 length SDUs and general DISC
  (tagged with a 0,0 dsap ssap couple) handling.

- RFKILL support for NFC."

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

197bbf0aedfb81ab70247264883c81e7f7d503ba