diff options
| author | Linus Torvalds <[email protected]> | 2021-09-10 20:29:04 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2021-09-10 20:29:04 +0000 |
| commit | 926de8c4326c14fcf35f1de142019043597a4fac (patch) | |
| tree | e6a1d59f16438a9231b551b28d87f0abee8dfe93 /fs/proc/array.c | |
| parent | Merge tag 'pm-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff) | |
| parent | Merge branches 'acpi-scan' and 'acpi-prm' (diff) | |
| download | kernel-926de8c4326c14fcf35f1de142019043597a4fac.tar.gz kernel-926de8c4326c14fcf35f1de142019043597a4fac.zip | |
Merge tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions