John W. Linville 59ef43e681 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ... Conflicts: drivers/net/wireless/iwlwifi/iwl-testmode.c include/net/nfc/nfc.h net/nfc/netlink.c net/wireless/nl80211.c		2012-04-18 14:27:48 -04:00
..
hci	NFC: SHDLC implementation	2012-04-12 15:10:35 -04:00
llcp	NFC: Fix LLCP link timeout typo	2012-04-12 15:10:45 -04:00
nci	NFC: The core part should generate the target index	2012-04-12 15:10:37 -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	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-04-18 14:27:48 -04:00
netlink.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-04-18 14:27:48 -04:00
nfc.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-04-18 14:27:48 -04:00
rawsock.c	NFC: Fix next target_idx type and rename for clarity	2012-04-12 15:10:37 -04:00