r8152 conflicts are the NAPI fixes in 'net' overlapping with some tasklet stuff in net-next Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Kconfig | ||
ksz8795_reg.h | ||
ksz8795_spi.c | ||
ksz8795.c | ||
ksz9477_reg.h | ||
ksz9477_spi.c | ||
ksz9477.c | ||
ksz_common.c | ||
ksz_common.h | ||
Makefile |