diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-25 21:54:45 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-25 21:54:45 +0200 |
| commit | 4c2628cd7580bc4f4a4994925cf366185ecc37a5 (patch) | |
| tree | a51a96e553122133b4f1492b1ccf833dde671b58 /drivers | |
| parent | d57d39431924d1628ac9b93a2de7f806fc80680a (diff) | |
| parent | 60f05e86cf3e8c5f379fe5ba94634fcec17dd67e (diff) | |
| parent | e7387da52028b072489c45efeb7a916c0205ebd2 (diff) | |
| parent | 3a17fb329da68cb00558721aff876a80bba2fdb9 (diff) | |
| download | linux-4c2628cd7580bc4f4a4994925cf366185ecc37a5.tar.gz | |
Merge branches 'pm-cpufreq', 'pm-cpuidle' and 'pm-core'
* pm-cpufreq: cpufreq: schedutil: Improve prints messages with pr_fmt cpufreq: simplified goto out in cpufreq_register_driver() cpufreq: governor: CPUFREQ_GOV_STOP never fails cpufreq: governor: CPUFREQ_GOV_POLICY_EXIT never fails intel_pstate: Simplify conditional in intel_pstate_set_policy() * pm-cpuidle: cpuidle: Fix cpuidle_state_is_coupled() argument in cpuidle_enter() * pm-core: PM / sleep: Handle failures in device_suspend_late() consistently