From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 10 Sep 2021 18:27:07 +0000 (+0200)
Subject: Merge branches 'acpi-scan' and 'acpi-prm'
X-Git-Tag: v5.15-rc1~26^2
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=8fbc1c5b91133f7ae5254061d2cb3326992635c4

Merge branches 'acpi-scan' and 'acpi-prm'

* acpi-scan:
  ACPI: scan: Remove unneeded header linux/nls.h

* acpi-prm:
  ACPI: PRM: Find PRMT table before parsing it
---

8fbc1c5b91133f7ae5254061d2cb3326992635c4