From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 20 Feb 2017 13:28:03 +0000 (+0100)
Subject: Merge branches 'acpi-bus', 'acpi-sleep' and 'acpi-processor'
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a74d1cafc22e100a9b59c50943ca09c37e03dce8;p=openwrt%2Fstaging%2Fblogic.git

Merge branches 'acpi-bus', 'acpi-sleep' and 'acpi-processor'

* acpi-bus:
  spi: acpi: Initialize modalias from of_compatible
  i2c: acpi: Initialize info.type from of_compatible
  ACPI / bus: Introduce acpi_of_modalias() equiv of of_modalias_node()

* acpi-sleep:
  ACPI: save NVS memory for Lenovo G50-45

* acpi-processor:
  x86/ACPI: keep x86_cpu_to_acpiid mapping valid on CPU hotplug
---

a74d1cafc22e100a9b59c50943ca09c37e03dce8