]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 880a662 02cb489)
Merge branches 'acpi-pm' and 'acpi-numa'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 27 Jul 2017 21:14:08 +0000 (23:14 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 27 Jul 2017 21:14:08 +0000 (23:14 +0200)
* acpi-pm:
  ACPI / PM / EC: Flush all EC work in acpi_freeze_sync()
  ACPI / EC: Add parameter to force disable the GPE on suspend

* acpi-numa:
  ACPI: NUMA: Fix typo in the full name of SRAT
  ACPI: NUMA: add missing include in acpi_numa.h


Trivial merge
Linux kernel for KaRo TX COM modules