Merge branches 'acpi-pci', 'acpi-power' and 'acpi-misc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Jan 2019 09:12:07 +0000 (10:12 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Jan 2019 09:12:07 +0000 (10:12 +0100)
commit65a4f3a1efda8e0cc2516301fc3ad64e3eca716c
tree782332460b9d79a1c58ad81277edc71a72430af7
parent2b531d71595d2b5b12782a49b23c335869e2621e
parent2e61069b056f7ac3cde5f84a4be8aa703b57089d
parent7d7b467cb95bf29597b417d4990160d4ea6d69b9
parentb9ced18acf68dffebe6888c7ec765a2b1db7a039
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