Merge branches 'pm-cpuidle' and 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 Oct 2020 15:30:14 +0000 (16:30 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 Oct 2020 15:30:14 +0000 (16:30 +0100)
* pm-cpuidle:
  intel_idle: Fix max_cstate for processor models without C-state tables

* pm-sleep:
  PM: sleep: fix typo in kernel/power/process.c


Trivial merge