mirror of https://gitee.com/openkylin/linux.git
04f58c8854
Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| ks8695net.c | ||
| ks8695net.h | ||
| ks8842.c | ||
| ks8851.c | ||
| ks8851.h | ||
| ks8851_mll.c | ||
| ksz884x.c | ||