summaryrefslogtreecommitdiff
path: root/drivers/thermal
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-01-27 12:57:09 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-01-27 12:57:09 +0300
commit3dd855147feff375dfa6737331628ea919e9da59 (patch)
treefa4e6b1540380370826d52f4b21e8500bde1b501 /drivers/thermal
parentff7a672f83b355365478a1fdfb60933ef34d8d02 (diff)
parentff3154d1d89a2343fd5f82e65bc0cf1d4e6659b3 (diff)
parentd21a91629f4b8e794fc4c0e0c17c85cedf1d806c (diff)
parentd19e470b6605c900db21fc7b34c66b6891a79983 (diff)
parent9b1b5535dfc98a9d783199d4bcd8580e15daa23c (diff)
downloadlinux-3dd855147feff375dfa6737331628ea919e9da59.tar.xz
Merge branches 'acpi-battery', 'acpi-video', 'acpi-fan' and 'acpi-drivers'
* 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