]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'acpi-bus', 'acpi-sleep' and 'acpi-processor'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 20 Feb 2017 13:28:03 +0000 (14:28 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 20 Feb 2017 13:28:03 +0000 (14:28 +0100)
* 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


Trivial merge