]> 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)
commit01b57f0deeed2fd818551dca5384571e26df60b8
tree9dfe33ca030186ffd5007784d0647a8306d41be9
parent112b310bcf57c9061ac6c3b90d16d4f1911e8607
parent871a2caf93ee659f2043c4ab58a5369ad0e79f28
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