diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-02-15 12:01:53 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-02-15 12:01:53 +0100 |
| commit | 822ffaa58183e0b2dfdf4b51f04a387c9edd806d (patch) | |
| tree | 5a711e47b0d93d0d798b241ec3a4c8299569622d /Documentation | |
| parent | PM / runtime: Update links_count also if !CONFIG_SRCU (diff) | |
| parent | PM: cpuidle: Fix cpuidle_poll_state_init() prototype (diff) | |
| parent | Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-822ffaa58183e0b2dfdf4b51f04a387c9edd806d.tar.xz linux-822ffaa58183e0b2dfdf4b51f04a387c9edd806d.zip | |
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