Jakub Kicinski 833d22f2f9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Trivial conflict in CAN on file rename.

Conflicts:
	drivers/net/can/m_can/tcan4x5x-core.c

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2021-01-08 13:28:00 -08:00

..

Kconfig

can: m_can: add PCI glue driver for Intel Elkhart Lake

2020-12-10 10:40:10 +01:00

m_can_pci.c

can: m_can: use struct m_can_classdev as drvdata

2020-12-14 14:24:17 +01:00

m_can_platform.c

can: m_can: use struct m_can_classdev as drvdata

2020-12-14 14:24:17 +01:00

m_can.c

can: m_can: m_can_class_unregister(): remove erroneous m_can_clk_stop()

2021-01-07 09:27:19 +01:00

m_can.h

can: m_can: let m_can_class_allocate_dev() allocate driver specific private data

2020-12-14 14:24:14 +01:00

Makefile

can: tcan4x5x: move regmap code into seperate file

2021-01-06 15:15:37 +01:00

tcan4x5x-core.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2021-01-08 13:28:00 -08:00

tcan4x5x-regmap.c

can: tcan4x5x: add support for half-duplex controllers

2021-01-06 15:15:41 +01:00

tcan4x5x.h

can: tcan4x5x: rework SPI access

2021-01-06 15:15:41 +01:00