]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-cpuidle' and 'pm-opp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 15 Feb 2018 11:01:53 +0000 (12:01 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 15 Feb 2018 11:01:53 +0000 (12:01 +0100)
commit6a6e4663eab09e951884fb2314db6fcfd151daa0
tree5a711e47b0d93d0d798b241ec3a4c8299569622d
parentab1bee03dd57115e59a79df1030e3836171f26e1
parent059fea2093e31a018a3c6dd2aa635a445d9d107f
parent3c40b06c1e225cce65bbffe50fa06a69dc58c58f
Merge branches 'pm-cpuidle' and 'pm-opp'

* pm-cpuidle:
  PM: cpuidle: Fix cpuidle_poll_state_init() prototype
  Documentation/ABI: update cpuidle sysfs documentation

* pm-opp:
  opp: cpu: Replace GFP_ATOMIC with GFP_KERNEL in dev_pm_opp_init_cpufreq_table
include/linux/cpuidle.h