mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00: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 |