mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
60747ef4d1
Minor overlapping changes for both merge conflicts. Resolution work done by Stephen Rothwell was used as a reference. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
hns | ||
hip04_eth.c | ||
hisi_femac.c | ||
hix5hd2_gmac.c | ||
hns_mdio.c | ||
Kconfig | ||
Makefile |