linux-sg2042/drivers/nfc
John W. Linville b311749477 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
	drivers/net/wireless/iwlwifi/pcie/tx.c
2012-11-21 12:57:56 -05:00
..
pn544 NFC: Move pn544.h to linux/platform_data/ 2012-11-19 23:56:59 +01:00
Kconfig NFC: Remove the pn544 raw driver 2012-09-25 00:17:27 +02:00
Makefile NFC: Separate pn544 hci driver in HW dependant and independant parts 2012-10-26 18:26:46 +02:00
nfcwilink.c NFC: Move the nfcwilink dereference below the NULL test 2012-09-25 00:17:26 +02:00
pn533.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-11-21 12:57:56 -05:00