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.h	NFC: HCI support	2012-04-12 15:10:34 -04:00
nci.h	NFC: Add NCI multiple targets support	2012-01-24 14:32:29 -05:00
nci_core.h	NFC: NCI code identation fixes	2012-03-06 15:16:25 -05: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
shdlc.h	NFC: SHDLC implementation	2012-04-12 15:10:35 -04:00