Merge branches 'pm-cpuidle' and 'pm-sleep'

* 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
This commit is contained in:
Rafael J. Wysocki 2020-10-30 16:30:14 +01:00
2 changed files with 2 additions and 2 deletions