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> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
ksz8795.c | ||
ksz8795_reg.h | ||
ksz8795_spi.c | ||
ksz9477.c | ||
ksz9477_i2c.c | ||
ksz9477_reg.h | ||
ksz9477_spi.c | ||
ksz_common.c | ||
ksz_common.h |