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
..
Kconfig	can: tcan4x5x: Add tcan4x5x driver to the kernel	2019-07-24 10:31:54 +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: remove unnecessary m_can_class_resume() call	2019-11-22 15:34:37 +01:00
tcan4x5x.c	can: tcan4x5x: Remove checking the wake pin	2019-09-03 10:23:57 +02:00