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 98d5fac233 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ... Conflicts: drivers/net/wireless/iwlwifi/dvm/tx.c drivers/net/wireless/ti/wlcore/sdio.c drivers/net/wireless/ti/wlcore/spi.c		12 years ago
..
microread	NFC: microread: Fix mei physical layer	12 years ago
pn544	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	12 years ago
Kconfig	NFC: Initial support for Inside Secure microread	12 years ago
Makefile	NFC: Initial support for Inside Secure microread	12 years ago
nfcwilink.c	NFC: Initial Secure Element API	12 years ago
pn533.c	NFC: pn533: Fix target polling mode	12 years ago