From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Sep 2021 20:29:04 +0000 (-0700)
Subject: Merge tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~6396
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=926de8c4326c14fcf35f1de142019043597a4fac;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'acpi-5.15-rc1-3' of git://git./linux/kernel/git/rafael/linux-pm

Pull more ACPI updates from Rafael Wysocki:
 "These prevent a confusing PRMT-related message from being printed,
  drop an unnecessary header file include and update the list of ACPICA
  maintainers.

  Specifics:

   - Prevent a message about missing PRMT from being printed on systems
     that do not support PRM, which are the majority now (Aubrey Li).

   - Drop unnecessary header include from scan.c (Kari Argillander).

   - Update the list of ACPICA maintainers after recent departure of one
     of them (Rafael Wysocki)"

* tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPICA: Update the list of maintainers
  ACPI: PRM: Find PRMT table before parsing it
  ACPI: scan: Remove unneeded header linux/nls.h
---

926de8c4326c14fcf35f1de142019043597a4fac