From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 30 Oct 2020 15:30:14 +0000 (+0100)
Subject: Merge branches 'pm-cpuidle' and 'pm-sleep'
X-Git-Tag: microblaze-v5.12~479^2
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=dea47cf45a7f9bb94684830c47d4b259d5f8d6af;p=linux-2.6-microblaze.git

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
---

dea47cf45a7f9bb94684830c47d4b259d5f8d6af