From: John W. Linville Date: Wed, 22 May 2013 18:23:05 +0000 (-0400) Subject: Samuel Ortiz says: X-Git-Tag: upstream/snapshot3+hdmi~4870^2~34^2~40 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=323a98db4d51e4fefc74290adfb5493047cbbe22;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Samuel Ortiz says: "Merge tag 'nfc-fixes-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes This is the first batch of NFC fixes for 3.10, and it contains: - 3 fixes for the NFC MEI support: * We now depend on the correct Kconfig symbol. * We register an MEI event callback whenever we enable an NFC device, otherwise we fail to read anything after an enable/disable cycle. * We only disable an MEI device from its disable mey_phy_ops, preventing useless consecutive disable calls. - An NFC Makefile cleanup, as I forgot to remove a commented out line when moving the LLCP code to the NFC top level directory." Signed-off-by: John W. Linville --- 323a98db4d51e4fefc74290adfb5493047cbbe22