diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-02 17:38:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-02 17:38:30 -0800 |
| commit | 3f80dd67c367878aaad16e458eebc3c8980bb841 (patch) | |
| tree | afe3a6fcc9fef494b0325ec8da94274ac9827678 /drivers/idle/intel_idle.c | |
| parent | Merge tag 'pm-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | Merge branch 'acpi-apei' (diff) | |
| download | linux-dev-3f80dd67c367878aaad16e458eebc3c8980bb841.tar.xz linux-dev-3f80dd67c367878aaad16e458eebc3c8980bb841.zip | |
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
Diffstat (limited to 'drivers/idle/intel_idle.c')
0 files changed, 0 insertions, 0 deletions