aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-10-14 14:10:19 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-10-14 14:10:19 +0200
commit522533f338f38e15106d5f58901f38fe7bd6a7d8 (patch)
treedabeac8f6da16ac119d0f6abfab36cf52d9ea7fd /drivers/acpi
parentMerge branches 'device-properties' and 'acpi-misc' (diff)
parentACPI / fan: Fix error reading cur_state (diff)
parentACPI / EC: Fix unused function warning when CONFIG_PM_SLEEP=n (diff)
parentACPI / PAD: don't register acpi_pad driver if running as Xen dom0 (diff)
parentacpi_os_vprintf: Use printk_get_level() to avoid unnecessary KERN_CONT (diff)
downloadlinux-dev-522533f338f38e15106d5f58901f38fe7bd6a7d8.tar.xz
linux-dev-522533f338f38e15106d5f58901f38fe7bd6a7d8.zip
Merge branches 'acpi-fan', 'acpi-ec', 'acpi-drivers' and 'acpi-osl'
* acpi-fan: ACPI / fan: Fix error reading cur_state * acpi-ec: ACPI / EC: Fix unused function warning when CONFIG_PM_SLEEP=n * acpi-drivers: ACPI / PAD: don't register acpi_pad driver if running as Xen dom0 * acpi-osl: acpi_os_vprintf: Use printk_get_level() to avoid unnecessary KERN_CONT