From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 15 Feb 2018 11:01:53 +0000 (+0100)
Subject: Merge branches 'pm-cpuidle' and 'pm-opp'
X-Git-Tag: v4.16-rc2~20^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=822ffaa58183e0b2dfdf4b51f04a387c9edd806d;p=linux-2.6-block.git

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
---

822ffaa58183e0b2dfdf4b51f04a387c9edd806d