Merge branches 'pm-cpufreq-fixes' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 9 Jun 2016 21:49:16 +0000 (23:49 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 9 Jun 2016 21:49:16 +0000 (23:49 +0200)
commit3681196ae568f97d534537c1c1102f4707ca11f9
tree5db37b28d0e045e6ee843fa33b576f9feb5d84b6
parentaf8c34ce6ae32addda3788d54a7e340cad22516b
parent983e600e88835f0321d1a0ea06f52d48b7b5a544
parent9bd616e3dbedfc103f158197c8ad93678849b1ed
Merge branches 'pm-cpufreq-fixes' and 'pm-cpuidle'

* pm-cpufreq-fixes:
  cpufreq: intel_pstate: Fix ->set_policy() interface for no_turbo
  cpufreq: intel_pstate: Fix code ordering in intel_pstate_set_policy()

* pm-cpuidle:
  cpuidle: Do not access cpuidle_devices when !CONFIG_CPU_IDLE