13091aa305
Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
emac | ||
rmnet | ||
Kconfig | ||
Makefile | ||
qca_7k.c | ||
qca_7k.h | ||
qca_7k_common.c | ||
qca_7k_common.h | ||
qca_debug.c | ||
qca_debug.h | ||
qca_spi.c | ||
qca_spi.h | ||
qca_uart.c |