mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-04 12:54:37 +08:00
5c39f26e67
Trivial conflict in CAN, keep the net-next + the byteswap wrapper. Conflicts: drivers/net/can/usb/gs_usb.c Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
||
---|---|---|
.. | ||
dpio | ||
qbman | ||
qe | ||
dpaa2-console.c | ||
guts.c | ||
Kconfig | ||
Makefile | ||
rcpm.c |