]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'pm-avs', 'pm-clk', 'pm-devfreq' and 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 24 Mar 2016 23:58:18 +0000 (00:58 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 24 Mar 2016 23:58:18 +0000 (00:58 +0100)
* 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

1  2  3  4  5 
drivers/acpi/sleep.c
kernel/power/hibernate.c

Simple merge
Simple merge