“7ef71320eba8933275be10bfa44e083bec95b3f1”上不存在“drivers/gpio/gpio-ks8695.c”
-
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless由 John W. Linville 提交于
Conflicts: drivers/net/wireless/brcm80211/Kconfig net/mac80211/util.c
e08fd975
Conflicts: drivers/net/wireless/brcm80211/Kconfig net/mac80211/util.c