]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 317e2ca 5ceb5f0 2e018c5 b0f65b9 fbc9418)
Merge branches 'acpi-scan', 'acpi-tables', 'acpi-misc' and 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 May 2019 08:49:39 +0000 (10:49 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 May 2019 08:49:39 +0000 (10:49 +0200)
* acpi-scan:
  ACPI / scan: Add labels for PNP button devices
  ACPI / scan: Simplify acpi_bus_extract_wakeup_device_power_package()

* acpi-tables:
  ACPI / tables: Clean up whitespace

* acpi-misc:
  ACPI / DPTF: Use dev_get_drvdata()
  ACPI: event: replace strcpy() by strscpy()
  ACPI: Fix comment typos

* acpi-pm:
  ACPI: PM: Print debug messages when enabling GPEs for wakeup

1  2  3  4  5 
drivers/acpi/cppc_acpi.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history
drivers/acpi/scan.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history
drivers/acpi/tables.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history

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