From: John W. Linville Date: Mon, 13 Jan 2014 19:36:42 +0000 (-0500) Subject: Merge tag 'nfc-next-3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... X-Git-Tag: v3.14-rc1~94^2~3^2^2~44 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec665facde820179d71d0f064e692f449df2b94f;p=platform%2Fkernel%2Flinux-exynos.git Merge tag 'nfc-next-3.14-1' of git://git./linux/kernel/git/sameo/nfc-next Samuel Ortiz says: "This is the first NFC pull request for 3.14 It includes: * A new NFC driver for Marvell's 8897, and a few NCI fixes and improvements needed to support this chipset. * An LLCP fix for how we were setting the default MIU on a p2p link. If there is no explicit MIU extension announced at connection time, we must use the default one and not the one announced at LLCP link establishement time. * A pn544 EEPROM config update. Some of the currently EEPROM configured values are overwriting the firmware ones while other should not be set by the driver itself. * Some NFC digital stack fixes and improvements. Asynchronous functions are better documented, RF technologies and CRC functions are set upon PSL_REQ reception, and a few minor bugs are fixed. * Minor and miscelaneous pn533, mei_phy and port100 fixes." Signed-off-by: John W. Linville --- ec665facde820179d71d0f064e692f449df2b94f