summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-25 00:58:18 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-25 00:58:18 +0100
commit3513ac743df4a8522270bde4a20d75a42874487e (patch)
treec45f8db3749b6689abe7824fa9c23a6598627468 /kernel/power
parentMerge branches 'pm-cpufreq' and 'pm-cpuidle' (diff)
parentPM / AVS: rockchip-io: add io selectors and supplies for rk3399 (diff)
parentPM / clk: Add support for obtaining clocks from device-tree (diff)
parentPM / devfreq: Spelling s/frequnecy/frequency/ (diff)
parentACPI / PM: Runtime resume devices when waking from hibernate (diff)
downloadlinux-3513ac743df4a8522270bde4a20d75a42874487e.tar.xz
linux-3513ac743df4a8522270bde4a20d75a42874487e.zip
Merge branches 'pm-avs', 'pm-clk', 'pm-devfreq' and 'pm-sleep'
* pm-avs: PM / AVS: rockchip-io: add io selectors and supplies for rk3399 * pm-clk: PM / clk: Add support for obtaining clocks from device-tree * pm-devfreq: PM / devfreq: Spelling s/frequnecy/frequency/ * pm-sleep: ACPI / PM: Runtime resume devices when waking from hibernate PM / sleep: Clear pm_suspend_global_flags upon hibernate