From: John W. Linville Date: Mon, 11 Feb 2013 20:30:47 +0000 (-0500) Subject: Merge tag 'nfc-next-3.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... X-Git-Tag: firefly_0821_release~3680^2~1092^2~31^2^2~22 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d8eac3ad982ee32e3dee56626ba3d1fc577fcbc;p=firefly-linux-kernel-4.4.55.git Merge tag 'nfc-next-3.9-3' of git://git./linux/kernel/git/sameo/nfc-next Samuel Ortiz says: "This 3rd NFC pull request for 3.9 contains a fix for the microread MEI physical layer support, as the MEI bus API changed. From the MEI code, we now pass the MEI id back to the driver probe routine, and we also pass a name and a MEI id table through the mei_bus_driver structure. A few renames as well like e.g. mei_bus_driver to mei_driver or mei_bus_client to mei_device in order to be closer to the driver model practices." Signed-off-by: John W. Linville --- 5d8eac3ad982ee32e3dee56626ba3d1fc577fcbc