diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-06-26 17:09:49 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-06-26 17:09:49 +0200 |
| commit | 0e3fb2a128d81bc5baee76dddcc8ddbc8ccae95c (patch) | |
| tree | e3e1b667f374a27d4fab4b75983786faf4838fd2 /drivers | |
| parent | 0659d4205db4d0225efd8f83291cbacfcdea030c (diff) | |
| parent | 589bab6bb30c8cd43a7da6dcf43cc3a586cc2e25 (diff) | |
| parent | 10e8b11eb3195e11450c509d4dd3984d707a4167 (diff) | |
| download | linux-0e3fb2a128d81bc5baee76dddcc8ddbc8ccae95c.tar.bz2 | |
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