John W. Linville 5d22df200b Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ... Conflicts: drivers/net/wireless/iwlwifi/iwl-agn.c		2011-12-14 14:35:41 -05:00
..
nci	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2011-12-14 14:35:41 -05:00
af_nfc.c	net: Fix files explicitly needing to include module.h	2011-10-31 19:30:28 -04:00
core.c	nfc: Remove unused nfc_printk and nfc_<level> macros	2011-11-30 15:08:37 -05:00
Kconfig	NFC: basic NCI protocol implementation	2011-09-20 14:43:49 -04:00
Makefile	NFC: basic NCI protocol implementation	2011-09-20 14:43:49 -04:00
netlink.c	nfc: Remove function tracer like entry messages	2011-11-30 15:08:38 -05:00
nfc.h	nfc: Remove unused nfc_printk and nfc_<level> macros	2011-11-30 15:08:37 -05:00
rawsock.c	nfc: Convert nfc_dbg to pr_debug	2011-11-30 15:08:36 -05:00