David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-06 18:44:57 -07:00
..
Kconfig	can: Kconfig: correct history of the CAN protocol	2019-07-24 10:31:55 +02:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
af_can.c	can: Add SPDX license identifiers for CAN subsystem	2019-07-24 10:31:55 +02:00
af_can.h	can: Add SPDX license identifiers for CAN subsystem	2019-07-24 10:31:55 +02:00
bcm.c	can: fix ioctl function removal	2019-07-29 14:12:35 -07:00
gw.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-06 18:44:57 -07:00
proc.c	can: Add SPDX license identifiers for CAN subsystem	2019-07-24 10:31:55 +02:00
raw.c	can: fix ioctl function removal	2019-07-29 14:12:35 -07:00