Conflicts: drivers/cpufreq/cpufreq_interactive.c drivers/net/wireless/bcmdhd/dhd_linux.c drivers/net/wireless/bcmdhd/wl_cfg80211.c scripts/Kbuild.include