Jakub Kicinski 55fd59b003 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: drivers/net/ethernet/ibm/ibmvnic.c Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-12-03 15:44:09 -08:00
..
ems_pci.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 344	2019-06-05 17:37:07 +02:00
ems_pcmcia.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 495	2019-06-19 17:09:52 +02:00
f81601.c	can: sja1000: f81601: remove unused including <linux/version.h>	2019-08-13 16:37:03 +02:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
kvaser_pci.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 344	2019-06-05 17:37:07 +02:00
Makefile	can: sja1000: f81601: add Fintek F81601 support	2019-07-24 10:30:37 +02:00
peak_pci.c	can: drivers: fix spelling mistakes	2020-09-21 10:13:16 +02:00
peak_pcmcia.c	can: drivers: fix spelling mistakes	2020-09-21 10:13:16 +02:00
plx_pci.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 344	2019-06-05 17:37:07 +02:00
sja1000_isa.c	remove ioremap_nocache and devm_ioremap_nocache	2020-01-06 09:45:59 +01:00
sja1000_platform.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
sja1000.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-03 15:44:09 -08:00
sja1000.h	can: sja1000: use common prefix for all sja1000 defines	2013-04-16 12:39:14 +02:00
tscan1.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00