mirror of https://gitee.com/openkylin/linux.git
13dfb3fa49
Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
mtk_eth_path.c | ||
mtk_eth_soc.c | ||
mtk_eth_soc.h | ||
mtk_sgmii.c |