diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-01-11 10:12:07 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-01-11 10:12:07 +0100 |
| commit | 65a4f3a1efda8e0cc2516301fc3ad64e3eca716c (patch) | |
| tree | 782332460b9d79a1c58ad81277edc71a72430af7 /drivers/acpi | |
| parent | 2b531d71595d2b5b12782a49b23c335869e2621e (diff) | |
| parent | 2e61069b056f7ac3cde5f84a4be8aa703b57089d (diff) | |
| parent | 7d7b467cb95bf29597b417d4990160d4ea6d69b9 (diff) | |
| parent | b9ced18acf68dffebe6888c7ec765a2b1db7a039 (diff) | |
| download | linux-65a4f3a1efda8e0cc2516301fc3ad64e3eca716c.tar.bz2 | |
Merge branches 'acpi-pci', 'acpi-power' and 'acpi-misc'
* acpi-pci:
ACPI: Fix build failure when CONFIG_NLS is set to 'n'
* acpi-power:
ACPI: power: Skip duplicate power resource references in _PRx
* acpi-misc:
ACPI: NUMA: Use correct type for printing addresses on i386-PAE