Merge branch 'acpi-apei'
authorRafael J. Wysocki <[email protected]>
Thu, 2 Mar 2017 23:45:22 +0000 (00:45 +0100)
committerRafael J. Wysocki <[email protected]>
Thu, 2 Mar 2017 23:45:22 +0000 (00:45 +0100)
* acpi-apei:
  ACPI: APEI: Fix BERT resources conflict with ACPI NVS area


Trivial merge