You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		12 years ago
..
pn544	NFC: Move pn544.h to linux/platform_data/	12 years ago
Kconfig	NFC: Remove the pn544 raw driver	13 years ago
Makefile	NFC: Separate pn544 hci driver in HW dependant and independant parts	12 years ago
nfcwilink.c	NFC: Move the nfcwilink dereference below the NULL test	13 years ago
pn533.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	12 years ago