diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-25 15:10:55 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-25 15:10:55 +0100 |
commit | 38233a2de382318f5d506da1812efd258f583bd4 (patch) | |
tree | a88a218bc6f82c327a0835d1083457d6f3767905 | |
parent | 46cf053efec6a3a5f343fead837777efe8252a46 (diff) | |
parent | ff3154d1d89a2343fd5f82e65bc0cf1d4e6659b3 (diff) | |
parent | d21a91629f4b8e794fc4c0e0c17c85cedf1d806c (diff) | |
parent | d19e470b6605c900db21fc7b34c66b6891a79983 (diff) | |
parent | 9b1b5535dfc98a9d783199d4bcd8580e15daa23c (diff) |
Merge branches 'acpi-battery', 'acpi-video', 'acpi-fan' and 'acpi-drivers' into linux-next
* acpi-battery:
ACPI / battery: Deal better with neither design nor full capacity not being reported
ACPI / battery: Use design-cap for capacity calculations if full-cap is not available
ACPI / battery: Deal with design or full capacity being reported as -1
* acpi-video:
ACPI: video: Do not export a non working backlight interface on MSI MS-7721 boards
ACPI: video: Use native backlight on Lenovo E41-25/45
ACPI: video: fix typo in comment
* acpi-fan:
ACPI: fan: Expose fan performance state information
* acpi-drivers:
thermal: int340x_thermal: Add Tiger Lake ACPI device IDs
platform/x86: intel-hid: Add Tiger Lake ACPI device ID
ACPI: fan: Add Tiger Lake ACPI device ID
ACPI: DPTF: Add Tiger Lake ACPI device IDs