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
..
Kconfig	NFC: Remove CONFIG_EXPERIMENTAL from the LLCP Makefile	2012-10-26 18:26:52 +02:00
commands.c	NFC: Stop sending LLCP frames when tx queues are getting too deep	2012-11-19 23:57:00 +01:00
llcp.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-11-21 12:57:56 -05:00
llcp.h	NFC: Extend netlink interface for LTO, RW, and MIUX parameters support	2012-10-29 00:25:11 +01:00
sock.c	NFC: Implement LLCP connection less Tx path	2012-10-26 18:26:51 +02:00