diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-03 00:03:29 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-03 00:03:29 +0200 |
commit | 60319130254084b337e02439d3b4ec301b6328bb (patch) | |
tree | 24856d66836edafb247a73b77aee34980ec3524d /drivers/acpi | |
parent | Linux 4.12-rc3 (diff) | |
parent | Revert "ACPI / button: Change default behavior to lid_init_state=open" (diff) | |
parent | ACPICA: Tables: Fix regression introduced by a too early mechanism enabling (diff) | |
parent | ACPI / sysfs: fix acpi_get_table() leak / acpi-sysfs denial of service (diff) | |
download | linux-60319130254084b337e02439d3b4ec301b6328bb.tar.xz linux-60319130254084b337e02439d3b4ec301b6328bb.zip |
Merge branches 'acpi-button', 'acpica' and 'acpi-sysfs'
* acpi-button:
Revert "ACPI / button: Change default behavior to lid_init_state=open"
* acpica:
ACPICA: Tables: Fix regression introduced by a too early mechanism enabling
* acpi-sysfs:
ACPI / sysfs: fix acpi_get_table() leak / acpi-sysfs denial of service