Merge tag 'nfc-next-3.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Feb 2013 19:42:37 +0000 (14:42 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Feb 2013 19:42:37 +0000 (14:42 -0500)
Samuel says:

"This is the 2nd NFC pull request.

With this one we have a new NFC driver for Inside Secure microread and a few
pn533 fixes.
Microread is an HCI based NFC IP and the driver we're pushing supports tags
R/W, and NFC p2p. It's supported over the i2c and MEI busses."

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

Trivial merge