From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 23 Oct 2014 21:03:20 +0000 (+0200)
Subject: Merge branches 'pm-cpuidle' and 'pm-cpufreq'
X-Git-Tag: firefly_0821_release~176^2~2975^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a91e99e27a683608d221fb18b70d7de9d801de4a;p=firefly-linux-kernel-4.4.55.git

Merge branches 'pm-cpuidle' and 'pm-cpufreq'

* pm-cpuidle:
  cpuidle: powernv: Populate cpuidle state details by querying the device-tree

* pm-cpufreq:
  intel_pstate: Correct BYT VID values.
  intel_pstate: Fix BYT frequency reporting
  intel_pstate: Don't lose sysfs settings during cpu offline
  cpufreq: intel_pstate: Reflect current no_turbo state correctly
  cpufreq: expose scaling_cur_freq sysfs file for set_policy() drivers
  cpufreq: intel_pstate: Fix setting max_perf_pct in performance policy
  cpufreq: cpufreq-dt: adjust message related to regulators
  cpufreq: cpufreq-dt: extend with platform_data
  cpufreq: allow driver-specific data
---

a91e99e27a683608d221fb18b70d7de9d801de4a