From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 15 Feb 2023 19:09:09 +0000 (+0100)
Subject: Merge branches 'pm-tools' and 'pm-docs'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=dd855f01e8d194d2dfeda36b620203c623c10430;p=linux.git

Merge branches 'pm-tools' and 'pm-docs'

Merge power management utilities and documentation updates for 6.3-rc1:

 - Modify some power management utilities to use the canonical ftrace
   path (Ross Zwisler).

 - Correct spelling problems for Documentation/power/ as reported by
   codespell (Randy Dunlap).

* pm-tools:
  PM: tools: use canonical ftrace path

* pm-docs:
  Documentation: power: correct spelling
---

dd855f01e8d194d2dfeda36b620203c623c10430