From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 26 Jun 2020 15:09:49 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq' and 'pm-cpuidle'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0e3fb2a128d81bc5baee76dddcc8ddbc8ccae95c;p=linux.git

Merge branches 'pm-cpufreq' and 'pm-cpuidle'

* pm-cpufreq:
  cpufreq: intel_pstate: Add one more OOB control bit

* pm-cpuidle:
  cpuidle: Rearrange s2idle-specific idle state entry code
  PM: s2idle: Clear _TIF_POLLING_NRFLAG before suspend to idle
---

0e3fb2a128d81bc5baee76dddcc8ddbc8ccae95c