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/sysfs.c | |
| parent | 5ed02dbb497422bf225783f46e6eadd237d23d6b (diff) | |
| parent | 878d8db039daac0938238e9a40a5bd6e50ee3c9b (diff) | |
| parent | 2ea65321b83539afc1d45c1bea39c55ab42af62b (diff) | |
| parent | 0de0e198bc7191a0e46cf71f66fec4d07ca91396 (diff) | |
| download | linux-60319130254084b337e02439d3b4ec301b6328bb.tar.gz linux-60319130254084b337e02439d3b4ec301b6328bb.tar.bz2 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