mirror of
https://github.com/LineageOS/android_kernel_fxtec_sm6115.git
synced 2026-06-27 15:04:53 +00: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>