diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-08 13:37:44 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-08 13:37:44 +0100 |
commit | 2dae60faa4eb27fafe0805885d4f95c792345509 (patch) | |
tree | 4e9a2286b70cc1bdef28ed3d848b845043092b83 /include/acpi | |
parent | 629d398cd64f7c36a95b1857730a492e79452158 (diff) | |
parent | 0c6543f6cda442f5497b2d59ac0dcdda45f4778c (diff) | |
parent | febf2407418a2d6c042fcd77b206040449cb9a70 (diff) |
Merge branches 'acpi-bus' and 'acpi-processor' into linux-next
* 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-processor:
x86/ACPI: keep x86_cpu_to_acpiid mapping valid on CPU hotplug