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> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
af_packet.c | ||
diag.c | ||
internal.h |