Merge branches 'pm-cpufreq' and 'pm-em' into linux-next

* pm-cpufreq:
  cpufreq: intel_pstate: cancel HWP notify work in driver cleanup

* pm-em:
  PM: EM: allocate the cpumask for every perf domain