Merge branch 'acpi-apei'

* acpi-apei:
  ACPI: APEI: Fix BERT resources conflict with ACPI NVS area
This commit is contained in:
Rafael J. Wysocki 2017-03-03 00:45:22 +01:00
commit 0cb3b79efa