diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-18 18:43:16 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-18 18:43:16 +0100 |
commit | 0a0666428680c4a68d050491d5323a2ef05e08a7 (patch) | |
tree | 8c231099549e3fb6925d7804e4524b44aeb2891b /drivers/acpi | |
parent | Merge branches 'acpi-scan', 'acpi-utils' and 'acpi-pm' (diff) | |
parent | ACPI / Fan: Use bus id as the name for non PNP0C0B (Fan) devices (diff) | |
parent | ACPI / video: update the skip case for acpi_video_device_in_dod() (diff) | |
parent | ACPI / EC: Fix unexpected ec_remove_handlers() invocations (diff) | |
download | linux-0a0666428680c4a68d050491d5323a2ef05e08a7.tar.xz linux-0a0666428680c4a68d050491d5323a2ef05e08a7.zip |
Merge branches 'acpi-fan', 'acpi-video' and 'acpi-ec'
* acpi-fan:
ACPI / Fan: Use bus id as the name for non PNP0C0B (Fan) devices
* acpi-video:
ACPI / video: update the skip case for acpi_video_device_in_dod()
* acpi-ec:
ACPI / EC: Fix unexpected ec_remove_handlers() invocations