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

* pm-cpuidle:
  cpuidle: haltpoll: Add trace points for guest_halt_poll_ns grow/shrink

* pm-cpufreq:
  cpufreq: Drop unnecessary cpus locking from store()
  cpufreq: Optimize cpufreq_show_cpus()