From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Jan 2025 17:04:10 +0000 (-0800)
Subject: Merge tag 'pm-6.13-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: v6.13~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b4ccf11fa5dae17ac815c5a07ce56655d60a815;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'pm-6.13-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "Update the documentation of cpuidle governors that does not match the
  code any more after previous functional changes (Rafael Wysocki) and
  fix up the cpufreq Kconfig file broken inadvertently by a previous
  update (Viresh Kumar)"

* tag 'pm-6.13-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: Move endif to the end of Kconfig file
  cpuidle: teo: Update documentation after previous changes
  cpuidle: menu: Update documentation after previous changes
---

6b4ccf11fa5dae17ac815c5a07ce56655d60a815