summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-02-20 14:28:03 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-02-20 14:28:03 +0100
commita74d1cafc22e100a9b59c50943ca09c37e03dce8 (patch)
tree7614a2777a7b9f6d8981a56ea2a4725bd99c2a38 /drivers/acpi
parent014f40393ebc4ad4167d415597bad0636e5e21f9 (diff)
parent0c6543f6cda442f5497b2d59ac0dcdda45f4778c (diff)
parentcbc00c1310d34139a63946482b40a6b261a03fb9 (diff)
parentfebf2407418a2d6c042fcd77b206040449cb9a70 (diff)
downloadlinux-a74d1cafc22e100a9b59c50943ca09c37e03dce8.tar.bz2
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