John W. Linville 98d5fac233 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ...

Conflicts:
	drivers/net/wireless/iwlwifi/dvm/tx.c
	drivers/net/wireless/ti/wlcore/sdio.c
	drivers/net/wireless/ti/wlcore/spi.c

2013-02-18 13:47:13 -05:00

..

microread

NFC: microread: Fix mei physical layer

2013-02-11 18:35:36 +01:00

pn544

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2013-01-28 14:43:00 -05:00

Kconfig

NFC: Initial support for Inside Secure microread

2013-02-03 20:37:42 +01:00

Makefile

NFC: Initial support for Inside Secure microread

2013-02-03 20:37:42 +01:00

nfcwilink.c

NFC: Initial Secure Element API

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

pn533.c

NFC: pn533: Fix target polling mode

2013-02-08 12:18:48 +01:00