From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 9 Jun 2016 21:49:16 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq-fixes' and 'pm-cpuidle'
X-Git-Tag: Ubuntu-5.2.0-15.16~9012^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3681196ae568f97d534537c1c1102f4707ca11f9;p=mirror_ubuntu-eoan-kernel.git

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
---

3681196ae568f97d534537c1c1102f4707ca11f9