mirror of
https://github.com/xenia-project/linux.git
synced 2026-01-31 01:35:30 +01: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>