diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-25 23:03:13 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-25 23:03:13 +0300 |
commit | 268f77b5250998b871fa54a2a9703871fb44544e (patch) | |
tree | cab619502cb6ccd99445a822067fb24afa256b9c /drivers/net/can/dev/dev.c | |
parent | 6fbd6cf85a3be127454a1ad58525a3adcf8612ab (diff) | |
parent | b11ffaeacd1984b1fca41374c769fb0ff0aa0a42 (diff) | |
download | linux-268f77b5250998b871fa54a2a9703871fb44544e.tar.xz |
Merge tag 'acpi-5.12-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI updates from Rafael Wysocki:
"These make additional changes to the platform profile interface merged
recently and add support for the FPDT ACPI table.
Specifics:
- Rearrange Kconfig handling of ACPI_PLATFORM_PROFILE, add
"balanced-performance" to the list of supported platform profiles
and fix up some file references in a comment (Maximilian Luz).
- Add support for parsing the ACPI Firmware Performance Data Table
(FPDT) and exposing the data from there via sysfs (Zhang Rui)"
* tag 'acpi-5.12-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: platform: Add balanced-performance platform profile
ACPI: platform: Fix file references in comment
ACPI: platform: Hide ACPI_PLATFORM_PROFILE option
ACPI: tables: introduce support for FPDT table
Diffstat (limited to 'drivers/net/can/dev/dev.c')
0 files changed, 0 insertions, 0 deletions