Merge branches 'acpi-processor', 'acpi-hotplug', 'acpi-init', 'acpi-pm' and 'acpica'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 29 Jan 2014 10:47:18 +0000 (11:47 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 29 Jan 2014 10:47:18 +0000 (11:47 +0100)
commit82e180598b54873553fb1d285fb0c90fc54f8f23
treee4edee0847bef9a340589532bce5f1277d9c231f
parent09da8dfa98682d871987145ed11e3232accac860
parentf778d1218f10504a87353c696faf116481fa27a6
parenta951c773bc39677ef3fa42814be7f5218a3100b2
parent49a12877d2777cadcb838981c3c4f5a424aef310
parent79c0373f3e847309f4f33d23f2bf088ee3b1ac34
parent481c13814a4ecc8305fb7c871067a73cafd09d07
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.
drivers/acpi/acpi_processor.c
drivers/acpi/bus.c
drivers/acpi/device_pm.c
drivers/acpi/processor_core.c
drivers/acpi/scan.c
drivers/acpi/sysfs.c