From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Mar 2017 01:38:30 +0000 (-0800)
Subject: Merge tag 'acpi-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.14-rc1~1360
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f80dd67c367878aaad16e458eebc3c8980bb841;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'acpi-extra-4.11-rc1' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "This fixes an apparent, but actually artificial, resource conflict
  between the ACPI NVS memory region and the ACPI BERT (Boot Error
  Record Table) address range (Huang Ying)"

* tag 'acpi-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: APEI: Fix BERT resources conflict with ACPI NVS area
---

3f80dd67c367878aaad16e458eebc3c8980bb841