summaryrefslogtreecommitdiffstats
path: root/kernel
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
parent33068b61f8c041e67b554ddcb44c25ca748d38f6 (diff)
parentf447671b9e4fa4b0c9faf39455269d62d94218ae (diff)
parent02113ba93ea414b7113d64e42b87dc0720e3e578 (diff)
parent027b6934aaa3a7eff90598980aca992b5f1f1e2e (diff)
parentfbda4b38fa3995aa0777fe9cbbdcb223c6292083 (diff)
downloadlinux-3513ac743df4a8522270bde4a20d75a42874487e.tar.bz2
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