From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Aug 2021 19:30:29 +0000 (-0700)
Subject: Merge tag 'pm-5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: accepted/tizen/unified/20230118.172025~6701
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9917de73b499d160e76b6cc0aad2b3869dd057a3;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'pm-5.14-rc5' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "Fix a recent regression in the timer events oriented (TEO) cpuidle
  governor causing it to misbehave when idle state 0 is disabled and
  rename two local variables for improved clarity on top of that"

* tag 'pm-5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpuidle: teo: Rename two local variables in teo_select()
  cpuidle: teo: Fix alternative idle state lookup
---

9917de73b499d160e76b6cc0aad2b3869dd057a3