From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Date: Mon, 2 Apr 2018 08:58:13 +0000 (+0200) Subject: Merge branches 'acpi-battery', 'acpi-doc' and 'acpi-pmic' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0c9ed61bddd27cf95067e17c3d25634e25c4204b;p=linux.git Merge branches 'acpi-battery', 'acpi-doc' and 'acpi-pmic' * acpi-battery: Revert "ACPI: battery: Add the ThinkPad "Not Charging" quirk" ACPI: battery: do not export degraded capacity values over 100 ACPI: battery: make function __battery_hook_unregister() static ACPI: battery: Add the ThinkPad "Not Charging" quirk thinkpad_acpi: Add support for battery thresholds power: add to_power_supply macro to the API battery: Add the battery hooking API * acpi-doc: ACPI: sysfs: Update device object sysfs documentation * acpi-pmic: ACPI / PMIC: Replace license boilerplate with SPDX license identifier --- 0c9ed61bddd27cf95067e17c3d25634e25c4204b