aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-29 11:47:18 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-29 11:47:18 +0100
commit82e180598b54873553fb1d285fb0c90fc54f8f23 (patch)
treee4edee0847bef9a340589532bce5f1277d9c231f /include
parentMerge tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff)
parentACPI / scan: reduce log level of "ACPI: \_PR_.CPU4: failed to get CPU APIC ID" (diff)
parentACPI / scan: Clear match_driver flag in acpi_bus_trim() (diff)
parentACPI / init: Flag use of ACPI and ACPI idioms for power supplies to regulator API (diff)
parentACPI / PM: Use ACPI_COMPANION() to get ACPI companions of devices (diff)
parentACPICA: Remove bool usage from ACPICA. (diff)
downloadlinux-dev-82e180598b54873553fb1d285fb0c90fc54f8f23.tar.xz
linux-dev-82e180598b54873553fb1d285fb0c90fc54f8f23.zip
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.