]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ed02db 878d8db 2ea6532 0de0e19)
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)
* 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

1  2  3  4 
drivers/acpi/button.c patch | diff1 | diff2 | diff3 | diff4 | blob | history
drivers/acpi/sysfs.c patch | diff1 | diff2 | diff3 | diff4 | blob | history

diff --cc drivers/acpi/button.c
Simple merge
diff --cc drivers/acpi/sysfs.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.