John W. Linville 635d999fd3 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ... Conflicts: net/mac80211/mlme.c		2012-07-09 16:34:34 -04:00
..
hci	NFC: Introduce target mode tx ops	2012-06-04 21:34:30 +02:00
llcp	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-07-09 16:34:34 -04:00
nci	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-07-09 16:34:34 -04: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
af_nfc.c	NFC: Core code identation fixes	2012-03-06 15:16:25 -05:00
core.c	NFC: Call the DEP link down ops even when in target mode	2012-06-04 21:34:31 +02:00
netlink.c	NFC: Switch to Initiator mode when getting NFC_ATTR_PROTOCOLS	2012-06-04 21:34:33 +02: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