mirror of
https://github.com/torvalds/linux
synced 2024-09-21 19:47:35 +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> |
||
---|---|---|
.. | ||
core.c | ||
firmware.c | ||
firmware.h | ||
i2c.c | ||
Kconfig | ||
Makefile | ||
nci.c | ||
nci.h | ||
s3fwrn5.h |