mirror of
https://github.com/hardkernel/linux.git
synced 2026-04-04 20:23:04 +09:00
Conflicts: drivers/net/phy/marvell.c Simple overlapping changes in drivers/net/phy/marvell.c Signed-off-by: David S. Miller <davem@davemloft.net>