diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-14 15:10:19 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-14 15:10:19 +0300 |
| commit | 522533f338f38e15106d5f58901f38fe7bd6a7d8 (patch) | |
| tree | dabeac8f6da16ac119d0f6abfab36cf52d9ea7fd /include | |
| parent | 3f62d5269bc59ce3797397cc54edab17fbe60682 (diff) | |
| parent | 84baf1725dc532d9746df2d216c1921154767109 (diff) | |
| parent | eab05ec38073f72389386f4a77fb58c06e246a4c (diff) | |
| parent | e311404f7925f6879817ebf471651c0bb5935604 (diff) | |
| parent | abc4b9a53ea8153e0e028762b22cb213685c52e3 (diff) | |
| download | linux-522533f338f38e15106d5f58901f38fe7bd6a7d8.tar.xz | |
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