]> git.baikalelectronics.ru Git - kernel.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)
commitad13abecd7a800c0becf4c4c8a417ad24a79fff8
tree9dfe33ca030186ffd5007784d0647a8306d41be9
parent77508a6420983740964dc4180a45227f0eedf1bf
parent93f64060947903e28c813175eec25d0a44b4ad2b
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