diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-04 10:43:34 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-04 10:43:34 +0200 |
commit | 6c128e798f5b481c22cd3f7a8d5df16f1a77ea7e (patch) | |
tree | 0702d127e284db57e3f006d9d62af17ea63a321f /drivers/scsi/scsi_error.c | |
parent | ba609f7f21e45fc1170aa6beffae922a82c1b2d8 (diff) | |
parent | 8f8027c5f935bf02bdc8806c109ddbb0e402283c (diff) | |
parent | 63fab6977a1f2f70ef0bc97e5de33dd5c51cb5b0 (diff) | |
parent | ec625a37c10c64681c00459912ce7318e133bf7a (diff) | |
parent | 91ea5b1dd3aedd8bbf710956f219109bbe0c26e0 (diff) | |
download | blackbird-op-linux-6c128e798f5b481c22cd3f7a8d5df16f1a77ea7e.tar.gz blackbird-op-linux-6c128e798f5b481c22cd3f7a8d5df16f1a77ea7e.zip |
Merge branches 'acpi-cppc', 'acpi-misc', 'acpi-battery' and 'acpi-ac'
* acpi-cppc:
mailbox: PCC: erroneous error message when parsing ACPI PCCT
ACPI / CPPC: Fix invalid PCC channel status errors
ACPI / CPPC: Document CPPC sysfs interface
cpufreq / CPPC: Support for CPPC v3
ACPI / CPPC: Check for valid PCC subspace only if PCC is used
ACPI / CPPC: Add support for CPPC v3
* acpi-misc:
ACPI: Add missing prototype_for arch_post_acpi_subsys_init()
ACPI: add missing newline to printk
* acpi-battery:
ACPI / battery: Add quirk to avoid checking for PMIC with native driver
ACPI / battery: Ignore AC state in handle_discharging on systems where it is broken
ACPI / battery: Add handling for devices which wrongly report discharging state
ACPI / battery: Remove initializer for unused ident dmi_system_id
ACPI / AC: Remove initializer for unused ident dmi_system_id
* acpi-ac:
ACPI / AC: Add quirk to avoid checking for PMIC with native driver