summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-01-11 10:12:07 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-01-11 10:12:07 +0100
commit65a4f3a1efda8e0cc2516301fc3ad64e3eca716c (patch)
tree782332460b9d79a1c58ad81277edc71a72430af7 /drivers/acpi
parent2b531d71595d2b5b12782a49b23c335869e2621e (diff)
parent2e61069b056f7ac3cde5f84a4be8aa703b57089d (diff)
parent7d7b467cb95bf29597b417d4990160d4ea6d69b9 (diff)
parentb9ced18acf68dffebe6888c7ec765a2b1db7a039 (diff)
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