197bbf0aed
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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRbIKSAAoJEIqAPN1PVmxK2pcQAIGch5i5hnxtw8ZWNmbJX6VR ZgKCXqU50v6nBibGEFBVb4kIrakV3AjIDdelFZedY1Zl2xIzZdAHfttTZm8NY4ra 9UHmk/lrqFhTWT88XycXGvYhVH38v/l2idRlLc2RsP/Z2gdy+3AqqLbz9z40NcTn FaWD9mzI34/3tn4hYRHxyn7IXJ+I6zer0+KmG9PqAkKwVK0AD/DaQLUcRSDHzn3g WlsP8XD6VQwaaeglWVnu2hepOZ+M4hgVRra4YHuj/JN///Bd9OSbUHA5T+om3HuA CAsDrHNq5pL+sMmNcF3hbwSYKJUD8grmCBpF2+Tyn689N/dO+vJL8uChTMSN24DV lF79uHVDz9BUHIvXZkH1uv0/ie4te2/XyAivbbE//Pz5Y0PRqXlV1it66tjGVCsL Y+opHD5lJJQ8fv4daEEDcuV/PFjVguH2bHIN5m75xWDy+oqzPvPV1FVrZwK50qO+ Yhesyl951xd8KbkrkUvfsUudizI5zPeT1NfJ+LmFtuC9KL2WCiep7MomdccA/UL/ 70o3cBB7D+bRv0ELXt6gG2jyGjy1m3jT1fyO54mCGdHwZlGrqOBWT7nhAnMJdPfw TOqUQnEdvweO0bPpnk+v3dh1w+4PkFBAvtEC8qFd7vDtpk/hgXaTuSUQzfOdgDsW S/q7sAi8N3YRNGbt4wGD =Y9pD -----END PGP SIGNATURE----- Merge tag 'nfc-next-3.10-2' of git://git.kernel.org/pub/scm/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>