linux/drivers/nfc
David S. Miller 24bc518a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-25 12:49:17 -05:00
..
pn544 NFC: Fix sparse warnings due to missing static 2012-10-26 18:26:49 +02: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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-25 12:49:17 -05:00