Merge branch 'pm-cpufreq-next' into linux-next

* pm-cpufreq-next:
  cpufreq: Perform light-weight init/teardown during suspend/resume
  cpufreq: Preserve policy structure across suspend/resume
  cpufreq: Introduce a flag ('frozen') to separate full vs temporary init/teardown
  cpufreq: Extract the handover of policy cpu to a helper function
  cpufreq: Extract non-interface related stuff from cpufreq_add_dev_interface
  cpufreq: Add helper to perform alloc/free of policy structure
  cpufreq: Fix misplaced call to cpufreq_update_policy()

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