-
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netJakub Kicinski authored
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>
5c39f26egit://git.kernel.org/pub/scm/linux/kernel/git/netdev/netJakub Kicinski authoredTrivial conflict in CAN, keep the net-next + the byteswap wrapper. Conflicts: drivers/net/can/usb/gs_usb.c Signed-off-by:
Loading