| commit | 833d22f2f922bbee6430e558417af060db6bbe9c | [log] [tgz] |
|---|---|---|
| author | Jakub Kicinski <kuba@kernel.org> | Fri Jan 08 13:28:00 2021 -0800 |
| committer | Jakub Kicinski <kuba@kernel.org> | Fri Jan 08 13:28:00 2021 -0800 |
| tree | 8d2d8824318d53d6d8e3b7bf5680f953a62c2f3b | |
| parent | 58334e7537278793c86baa88b70c48b0d50b00ae [diff] | |
| parent | 6279d812eab67a6df6b22fa495201db6f2305924 [diff] |
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>