Huang, Tao d03390bfcd Merge tag 'lsk-v3.10-android-14.11' ...

LSK Android 14.11 v3.10

Conflicts:
	arch/arm/include/asm/cputype.h

2014-12-05 21:18:34 +08:00

..

microread

NFC: microread: Potential overflows in microread_target_discovered()

2014-10-05 14:54:12 -07:00

pn544

NFC: mei: Do not disable MEI devices from their remove routine

2013-05-21 10:48:41 +02:00

bcm2079x-i2c.c

NFC: Add to support ap6441 & ap6493 nfc function.

2014-06-11 09:14:43 +08:00

Kconfig

NFC: Add to support ap6441 & ap6493 nfc function.

2014-06-11 09:14:43 +08:00

Makefile

NFC: Add to support ap6441 & ap6493 nfc function.

2014-06-11 09:14:43 +08:00

mei_phy.c

NFC: mei_phy: Register event callback when enabling the device

2013-05-21 10:48:40 +02:00

mei_phy.h

NFC: mei: Add a common mei bus API for NFC drivers

2013-04-16 00:39:31 +02:00

nfcwilink.c

NFC: Initial Secure Element API

2013-01-10 00:51:54 +01:00

pn533.c

NFC: pn533: Turn radio on and off when bringing the device up and down

2013-04-11 16:29:11 +02:00