projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae02168 7a4ea10 4f1c29d 66444f4)
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)
* 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

1  2  3  4 
drivers/acpi/battery.c patch | diff1 | diff2 | diff3 | diff4 | blob | history
drivers/platform/x86/Kconfig patch | diff1 | diff2 | diff3 | diff4 | blob | history

diff --cc drivers/acpi/battery.c
Simple merge
diff --cc drivers/platform/x86/Kconfig
Simple merge
Domain: System / Kernel;