diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-29 21:23:41 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-29 21:23:41 +0100 |
| commit | ff23ab2441e7ba5089e8631bad3a6569e7b6d5b8 (patch) | |
| tree | 0fddd2bb9f27e3f188e63230be1c024a57f7b373 | |
| parent | e0288b0e9e2a5dbad612ef6c7dba1f9b52cef27f (diff) | |
| parent | cb57720bf79688d64854a0a43565aa52303c1f3f (diff) | |
| parent | 62c4cf97e82cf79446642e599d155884f600cf17 (diff) | |
| download | gfs2-3.0-nmw-ff23ab2441e7ba5089e8631bad3a6569e7b6d5b8.tar.gz | |
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
* pm-cpufreq:
cpufreq: fix a NULL pointer dereference in __cpufreq_governor()
cpufreq-dt: defer probing if OPP table is not ready
* pm-cpuidle:
cpuidle / ACPI: remove unused CPUIDLE_FLAG_TIME_INVALID
cpuidle: ladder: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
cpuidle: menu: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID