summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-10-25 22:54:46 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-10-25 22:54:46 +0100
commit343ccb040e60c3688d4413e839975fc3c8f9e287 (patch)
treed58d5da0d55b96f6490044a489cc554ea6a60684 /arch/x86/kernel
parentMerge branch 'device-properties' (diff)
parentACPI / scan: use kstrdup_const() in acpi_add_id() (diff)
parentACPI / tables: test the correct variable (diff)
parentACPI / EC: Fix a race issue in acpi_ec_guard_event() (diff)
parentACPI: change acpi_sleep_proc_init() to return void (diff)
downloadlinux-343ccb040e60c3688d4413e839975fc3c8f9e287.tar.xz
linux-343ccb040e60c3688d4413e839975fc3c8f9e287.zip
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