| commit | 3f80dd67c367878aaad16e458eebc3c8980bb841 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 02 17:38:30 2017 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 02 17:38:30 2017 -0800 |
| tree | afe3a6fcc9fef494b0325ec8da94274ac9827678 | |
| parent | 080e4168c0834ccc853c48259e16a5c556c7ecba [diff] | |
| parent | 0cb3b79efabd4174ddeee40c2c1e5499ba67e067 [diff] |
Merge tag 'acpi-extra-4.11-rc1' of git://git.kernel.org/pub/scm/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