mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07:00
55b42b5ca2
Conflicts: drivers/net/phy/marvell.c Simple overlapping changes in drivers/net/phy/marvell.c Signed-off-by: David S. Miller <davem@davemloft.net>