diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-12-15 15:33:18 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-12-15 15:33:18 +0100 |
commit | 25fe64232ee5bdd328c1c4ae24e8fd2b88251834 (patch) | |
tree | be298c7942adde657347335c9e80c05933ed1ff4 /drivers/acpi/processor_perflib.c | |
parent | 5e2cde03da4006e06f002c0b410ca39833e760bd (diff) | |
parent | 423282af887b88bad97d1362129c9999593bc608 (diff) | |
parent | ec2a9cea9fca8581b0cd3d994fb99050d61a8130 (diff) | |
parent | 55130fb22a1c396139c3da46f939bf5a6a92095e (diff) | |
download | linux-stable-25fe64232ee5bdd328c1c4ae24e8fd2b88251834.tar.gz linux-stable-25fe64232ee5bdd328c1c4ae24e8fd2b88251834.tar.bz2 linux-stable-25fe64232ee5bdd328c1c4ae24e8fd2b88251834.zip |
Merge branches 'acpi-apei', 'acpi-misc' and 'acpi-processor'
* acpi-apei:
ACPI, APEI: make apei_resources_all static
* acpi-misc:
ACPI: acpi_drivers.h: Update the kernel doc
ACPI: acpi_drivers.h: Remove the leftover dead code
ACPI: tiny-power-button: Simplify the code using module_acpi_driver()
ACPI: SBS: Simplify the code using module_acpi_driver()
ACPI: SBS: Simplify the driver init code
ACPI: debug: Remove the not used function
ACPI: processor: Remove the duplicated ACPI_PROCESSOR_CLASS macro
* acpi-processor:
ACPI: processor: Drop duplicate setting of shared_cpu_map