OSDN Git Service

Merge branches 'acpi-scan', 'acpi-assorted' and 'acpi-tables' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 21 Sep 2015 12:28:15 +0000 (14:28 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 21 Sep 2015 12:28:15 +0000 (14:28 +0200)
commit92f7983a2dd39106d072b61a5b56a6841d38d117
tree58c4fa63f05729d5fdba896a4fbc9ff1008c56e0
parentd048f744aef33d698f153a1cff92691a3a5c4e37
parent6a0d12ef993c5291047d72e88d73d0aa2b967335
parentf934c745079ea3a15e8619350faf681dad42cc91
parenta3ac3506df6be1ca89036dd7532089f4caf72261
Merge branches 'acpi-scan', 'acpi-assorted' and 'acpi-tables' into linux-next

* 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-assorted:
  ACPI: change acpi_sleep_proc_init() to return void
  ACPI: change init_acpi_device_notify() to return void

* acpi-tables:
  x86, ACPI: Handle apic/x2apic entries in MADT in correct order
  ACPI / tables: Add acpi_subtable_proc to ACPI table parsers
drivers/acpi/scan.c
include/acpi/acpi_bus.h
include/linux/acpi.h