diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-03-03 00:45:22 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-03-03 00:45:22 +0100 |
commit | 0cb3b79efabd4174ddeee40c2c1e5499ba67e067 (patch) | |
tree | 38ef0d5e38240589bac8c7d752295cdbd556742e /drivers/idle/intel_idle.c | |
parent | Merge tag 'acpi-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
parent | ACPI: APEI: Fix BERT resources conflict with ACPI NVS area (diff) | |
download | linux-dev-0cb3b79efabd4174ddeee40c2c1e5499ba67e067.tar.xz linux-dev-0cb3b79efabd4174ddeee40c2c1e5499ba67e067.zip |
Merge branch 'acpi-apei'
* acpi-apei:
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