tree d58d5da0d55b96f6490044a489cc554ea6a60684
parent ab736d7dc17e681be001648607be20c549b6229c
parent 6a0d12ef993c5291047d72e88d73d0aa2b967335
parent 362414d9d2824ee0f4910a73e880860a90e75c3c
parent 611975470740b38084610e0a64ff4c6ff5aec89a
parent f934c745079ea3a15e8619350faf681dad42cc91
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1445810086 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1445810086 +0100

Merge branches 'acpi-scan', 'acpi-tables', 'acpi-ec' and 'acpi-assorted'

* acpi-scan:
  ACPI / scan: use kstrdup_const() in acpi_add_id()
  ACPI / scan: constify struct acpi_hardware_id::id
  ACPI / scan: constify first argument of struct acpi_scan_handler::match

* acpi-tables:
  ACPI / tables: test the correct variable
  x86, ACPI: Handle apic/x2apic entries in MADT in correct order
  ACPI / tables: Add acpi_subtable_proc to ACPI table parsers

* acpi-ec:
  ACPI / EC: Fix a race issue in acpi_ec_guard_event()
  ACPI / EC: Fix query handler related issues

* acpi-assorted:
  ACPI: change acpi_sleep_proc_init() to return void
  ACPI: change init_acpi_device_notify() to return void