diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-08 14:42:37 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-08 14:42:37 -0500 |
| commit | c6d3b2046e310b361da93fe6c44bde5522c782da (patch) | |
| tree | da0e7969d93eda809244b66688d1ec0c91fc8360 /net | |
| parent | 4d25a75bc6c3f71d8cd736cb5d9bb2ad4ba80792 (diff) | |
| parent | 52f2eaeec11c16c219f0e99b8496fbba86889830 (diff) | |
Merge tag 'nfc-next-3.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
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>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions