Merge branches 'acpi-button', 'acpica' and 'acpi-sysfs'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 2 Jun 2017 22:03:29 +0000 (00:03 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 2 Jun 2017 22:03:29 +0000 (00:03 +0200)
commit60319130254084b337e02439d3b4ec301b6328bb
tree24856d66836edafb247a73b77aee34980ec3524d
parent5ed02dbb497422bf225783f46e6eadd237d23d6b
parent878d8db039daac0938238e9a40a5bd6e50ee3c9b
parent2ea65321b83539afc1d45c1bea39c55ab42af62b
parent0de0e198bc7191a0e46cf71f66fec4d07ca91396
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
drivers/acpi/button.c
drivers/acpi/sysfs.c