From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 27 Jul 2017 21:14:08 +0000 (+0200)
Subject: Merge branches 'acpi-pm' and 'acpi-numa'
X-Git-Tag: v4.13-rc3~19^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f6248dd88dba3aeb19351410a027d92eee7ceb72;p=uclinux-h8%2Flinux.git

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
---

f6248dd88dba3aeb19351410a027d92eee7ceb72