Merge branches 'pm-cpufreq' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Jun 2020 15:09:49 +0000 (17:09 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Jun 2020 15:09:49 +0000 (17:09 +0200)
commit0e3fb2a128d81bc5baee76dddcc8ddbc8ccae95c
treee3e1b667f374a27d4fab4b75983786faf4838fd2
parent0659d4205db4d0225efd8f83291cbacfcdea030c
parent589bab6bb30c8cd43a7da6dcf43cc3a586cc2e25
parent10e8b11eb3195e11450c509d4dd3984d707a4167
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