mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07:00
833d22f2f9
Trivial conflict in CAN on file rename. Conflicts: drivers/net/can/m_can/tcan4x5x-core.c Signed-off-by: Jakub Kicinski <kuba@kernel.org>