summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-02-15 12:01:53 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-02-15 12:01:53 +0100
commit822ffaa58183e0b2dfdf4b51f04a387c9edd806d (patch)
tree5a711e47b0d93d0d798b241ec3a4c8299569622d
parent433986c2c265d106d6a8e88006e0131fefc92b7b (diff)
parentd7212cfb05ba802bea4dd6c90d61cfe6366ea224 (diff)
parent0aae2bf81afe08f61276205f73aa57e80246056c (diff)
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