OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
58b10698d2
linux/net/nfc
History
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
..
hci NFC: Export nfc_hci_sak_to_protocol() 2012-11-19 23:56:59 +01:00
llcp Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-11-21 12:57:56 -05:00
nci NFC: Remove CONFIG_EXPERIMENTAL from the NCI Makefile 2012-10-26 18:26:53 +02:00
af_nfc.c
core.c NFC: Fix some code style and whitespace issues 2012-10-26 18:26:52 +02:00
Kconfig NFC: Remove CONFIG_EXPERIMENTAL 2012-10-26 18:26:52 +02:00
Makefile
netlink.c NFC: Extend netlink interface for LTO, RW, and MIUX parameters support 2012-10-29 00:25:11 +01:00
nfc.h NFC: Extend netlink interface for LTO, RW, and MIUX parameters support 2012-10-29 00:25:11 +01:00
rawsock.c NFC: Fix some code style and whitespace issues 2012-10-26 18:26:52 +02:00