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.h	NFC: xmit from hci ops must return 0 or negative	2012-09-25 00:17:27 +02:00
llc.h	NFC: Add an shdlc llc module to llc core	2012-09-25 00:17:25 +02:00
nci.h	NFC: Parse NCI NFC-DEP activation params	2012-09-25 00:17:23 +02:00
nci_core.h	NFC: Implement NCI dep_link_up and dep_link_down	2012-09-25 00:17:23 +02:00
nfc.h	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