mirror of
https://github.com/Evolution-X-Devices/kernel_google_b1c1
synced 2026-02-03 11:11:10 +00:00
Conflicts: drivers/net/stmmac/stmmac_main.c drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_spi.c net/core/ethtool.c net/mac80211/scan.c