]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commitf6248dd88dba3aeb19351410a027d92eee7ceb72
tree9dfe33ca030186ffd5007784d0647a8306d41be9
parent880a66275ef4d1e08e5d4dcf4cec768de18c68ef
parent02cb489be7ad07e74ab40baa908d2e20460ebdb2
Merge branches 'acpi-pm' and 'acpi-numa'

* 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