![]() 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> |
||
---|---|---|
.. | ||
bnxt_re | ||
cxgb4 | ||
efa | ||
hfi1 | ||
hns | ||
i40iw | ||
mlx4 | ||
mlx5 | ||
mthca | ||
ocrdma | ||
qedr | ||
qib | ||
usnic | ||
vmw_pvrdma | ||
Makefile |