]> 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)
commit8da40aca6664272ce2a968d3fbea97560ac631cc
tree5a711e47b0d93d0d798b241ec3a4c8299569622d
parentb5c49b14e61f658155d669bbf1cf8e37cbc3f4ec
parentf7c2244cad8e3bd2e99d2e4b5b347306d0810307
parent397ff4468d669760802477dbf28821d6668e0abd
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