Jakub Kicinski 2295cddf99 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Minor conflicts in net/mptcp/protocol.h and tools/testing/selftests/net/Makefile. In both cases code was added on both sides in the same place so just keep both. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-10-15 12:43:21 -07:00
..
Kconfig	can: drivers: fix spelling mistakes	2020-09-21 10:13:16 +02:00
Makefile	can: tcan4x5x: Add tcan4x5x driver to the kernel	2019-07-24 10:31:54 +02:00
m_can.c	can: m_can: add support for handling arbitration error	2019-11-11 21:58:09 +01:00
m_can.h	can: m_can: Rename m_can_priv to m_can_classdev	2019-07-24 10:31:54 +02:00
m_can_platform.c	can: m_can_platform: don't call m_can_class_suspend in runtime suspend	2020-10-06 23:29:30 +02:00
tcan4x5x.c	can: tcan4x5x: tcan4x5x_parse_config(): fix inconsistent IS_ERR and PTR_ERR	2020-01-02 15:34:26 +01:00