diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-29 11:47:18 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-29 11:47:18 +0100 |
| commit | 82e180598b54873553fb1d285fb0c90fc54f8f23 (patch) | |
| tree | e4edee0847bef9a340589532bce5f1277d9c231f /drivers/acpi/bus.c | |
| parent | 09da8dfa98682d871987145ed11e3232accac860 (diff) | |
| parent | f778d1218f10504a87353c696faf116481fa27a6 (diff) | |
| parent | a951c773bc39677ef3fa42814be7f5218a3100b2 (diff) | |
| parent | 49a12877d2777cadcb838981c3c4f5a424aef310 (diff) | |
| parent | 79c0373f3e847309f4f33d23f2bf088ee3b1ac34 (diff) | |
| parent | 481c13814a4ecc8305fb7c871067a73cafd09d07 (diff) | |
| download | linux-82e180598b54873553fb1d285fb0c90fc54f8f23.tar.bz2 | |
Merge branches 'acpi-processor', 'acpi-hotplug', 'acpi-init', 'acpi-pm' and 'acpica'
* acpi-processor:
ACPI / scan: reduce log level of "ACPI: \_PR_.CPU4: failed to get CPU APIC ID"
ACPI / processor: Return specific error value when mapping lapic id
* acpi-hotplug:
ACPI / scan: Clear match_driver flag in acpi_bus_trim()
* acpi-init:
ACPI / init: Flag use of ACPI and ACPI idioms for power supplies to regulator API
* acpi-pm:
ACPI / PM: Use ACPI_COMPANION() to get ACPI companions of devices
* acpica:
ACPICA: Remove bool usage from ACPICA.