diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-23 23:03:20 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-23 23:03:20 +0200 |
| commit | a91e99e27a683608d221fb18b70d7de9d801de4a (patch) | |
| tree | c267699780741d0dbc35a0ce7b9eef430ae25b95 | |
| parent | 49fe0353689901b937ff21047a14d315bbbf78f3 (diff) | |
| parent | 74aa51b5ccd3975392e30d11820dc073c5f2cd32 (diff) | |
| parent | d022a65ed2473fac4a600e3424503dc571160a3e (diff) | |
Merge branches 'pm-cpuidle' and 'pm-cpufreq'pm+acpi-3.18-rc2
* 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