Merge branches 'acpi-battery', 'acpi-doc' and 'acpi-pmic'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 2 Apr 2018 08:58:13 +0000 (10:58 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 2 Apr 2018 08:58:13 +0000 (10:58 +0200)
commit0c9ed61bddd27cf95067e17c3d25634e25c4204b
treea50dbe774bf7d50edc34db5e1c420b92189b0364
parentae02168d7877daf3a8ffcc60237a64398ed943aa
parent7a4ea10c01cdda3d66aa98af258f150d863aee24
parent4f1c29d0dc7bde6df1c485f139fd8ee1d10b3485
parent66444f460e68d641a63f0787627bac6c1ee340b5
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
drivers/acpi/battery.c
drivers/platform/x86/Kconfig