diff options
| author |  Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2018-04-02 10:58:13 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2018-04-02 10:58:13 +0200 |
| commit | 0c9ed61bddd27cf95067e17c3d25634e25c4204b (patch) | |
| tree | a50dbe774bf7d50edc34db5e1c420b92189b0364 /drivers/platform | |
| parent | Merge branch 'acpica' (diff) | |
| parent | Revert "ACPI: battery: Add the ThinkPad "Not Charging" quirk" (diff) | |
| parent | ACPI: sysfs: Update device object sysfs documentation (diff) | |
| parent | ACPI / PMIC: Replace license boilerplate with SPDX license identifier (diff) | |
| download | linux-0c9ed61bddd27cf95067e17c3d25634e25c4204b.tar.gz linux-0c9ed61bddd27cf95067e17c3d25634e25c4204b.tar.bz2 linux-0c9ed61bddd27cf95067e17c3d25634e25c4204b.zip | |
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