summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-04-02 11:01:02 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-04-02 11:01:02 +0200
commit103cf0e5799ce024fd28dfab716d7111afe4b117 (patch)
tree4b4024d3916cba8e9fa38a1adc2538b5eeb8ca38 /include
parenta9f36db7ec653ddeba81ba43d56103eab1ab912a (diff)
parent4dc2375c1a4e88ed2701f6961e0e4f9a7696ad3c (diff)
parent700abc90f07b7f60e512c5d5b7cb33bdc207e47c (diff)
Merge branches 'pm-cpuidle' and 'pm-tools'
* pm-cpuidle: cpuidle: poll_state: Avoid invoking local_clock() too often PM: cpuidle/suspend: Add s2idle usage and time state attributes cpuidle: Enable coupled cpuidle support on Exynos3250 platform cpuidle: poll_state: Add time limit to poll_idle() ARM: cpuidle: Drop memory allocation error message from arm_idle_init_cpu() * pm-tools: pm-graph: AnalyzeSuspend v5.0 pm-graph: AnalyzeBoot v2.2 pm-graph: config files and installer