mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 02:23:16 +00:00
2295cddf99
Minor conflicts in net/mptcp/protocol.h and tools/testing/selftests/net/Makefile. In both cases code was added on both sides in the same place so just keep both. Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
||
---|---|---|
.. | ||
j1939 | ||
af_can.c | ||
af_can.h | ||
bcm.c | ||
gw.c | ||
isotp.c | ||
Kconfig | ||
Makefile | ||
proc.c | ||
raw.c |