Merge branch 'acpi-apei'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 2 Mar 2017 23:45:22 +0000 (00:45 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 2 Mar 2017 23:45:22 +0000 (00:45 +0100)
commit0cb3b79efabd4174ddeee40c2c1e5499ba67e067
tree38ef0d5e38240589bac8c7d752295cdbd556742e
parent43e31e40473a00c936ffb9c2eebedc0566c92e89
parent41139ac3cd76c6dff8286102a8ac62933c680463
Merge branch 'acpi-apei'

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