John W. Linville c487606f83 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ... Conflicts: net/nfc/netlink.c Signed-off-by: John W. Linville <linville@tuxdriver.com>		2012-09-28 11:11:16 -04:00
..
hci	NFC: Add dummy nfc_llc_shdlc_register definition	2012-09-27 10:48:08 +02:00
llcp	NFC: Fix sleeping in atomic when releasing socket	2012-09-27 10:52:22 +02:00
nci	NFC: Implement NCI dep_link_up and dep_link_down	2012-09-25 00:17:23 +02:00
af_nfc.c	NFC: Core code identation fixes	2012-03-06 15:16:25 -05:00
core.c	NFC: Use system_nrt_wq instead of custom ones	2012-09-25 00:17:23 +02:00
Kconfig	NFC: HCI support	2012-04-12 15:10:34 -04:00
Makefile	NFC: HCI support	2012-04-12 15:10:34 -04:00
netlink.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-09-28 11:11:16 -04:00
nfc.h	NFC: Introduce target mode rx data callback	2012-06-04 21:34:31 +02:00
rawsock.c	NFC: Return from rawsock_release when sk is NULL	2012-06-26 01:35:26 +02:00