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
..
c_can.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-03 15:44:09 -08:00
c_can.h	can: c_can: reg_map_{c,d}_can: mark as __maybe_unused	2020-10-06 22:44:26 +02:00
c_can_pci.c	can: c_can_pci: make c_can_pci_data const	2017-12-01 09:14:22 +01:00
c_can_platform.c	can: c_can: c_can_plaform: fix checkpatch warnings	2019-11-11 21:58:08 +01:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00