Jakub Kicinski a9f852e92e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Minor conflict in drivers/s390/net/qeth_l2_main.c, kept the lock from commit c8183f5489 ("s390/qeth: fix potential deadlock on workqueue flush"), removed the code which was removed by commit 9897d583b0 ("s390/qeth: consolidate some duplicated HW cmd code"). Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>		2019-11-22 16:27:24 -08:00
..
fdp
microread
nfcmrvl
nxp-nci
pn533
pn544
s3fwrn5
st-nci
st21nfca
st95hf
Kconfig
Makefile
mei_phy.c
mei_phy.h
nfcsim.c
port100.c	nfc: port100: handle command failure cleanly	2019-11-21 11:48:17 -08:00
trf7970a.c