From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 2 Mar 2017 23:45:22 +0000 (+0100)
Subject: Merge branch 'acpi-apei'
X-Git-Tag: v5.15~11746^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0cb3b79efabd4174ddeee40c2c1e5499ba67e067;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'acpi-apei'

* acpi-apei:
  ACPI: APEI: Fix BERT resources conflict with ACPI NVS area
---

0cb3b79efabd4174ddeee40c2c1e5499ba67e067