Merge branch 'pm-cpufreq' into linux-next

* pm-cpufreq:
  cpufreq: powernv: Fix bugs in powernv_cpufreq_{init/exit}
  cpufreq: intel_pstate: disable HWP notifications
  cpufreq: intel_pstate: Enable HWP by default
  cpufreq: Simplify the cpufreq_for_each_valid_entry()
  cpufreq: acpi-cpufreq: Drop pointless label from acpi_cpufreq_target()
  cpufreq: Rearrange __cpufreq_driver_target()

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc drivers/cpufreq/intel_pstate.c
Simple merge

diff --cc include/linux/cpufreq.h
Simple merge