tree 8039691acd50e311c4c02afd5a739caaee3c36cc
parent 3c94280456d9925a795e5d423330acac4b223823
parent 2c4c2a71bd6f75c3982ac09407889b110673ac83
parent b41901a2cf06f33c030be96c075872201089d47a
parent 887532ca7ca59fcf0547a79211756791128030a3
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1534234648 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1534234648 +0200

Merge branches 'acpi-button', 'acpi-battery' and 'acpi-osi'

Merge updates of the ACPI battery and button drivers and support for
a new OEM _OSI string for 4.19.

* acpi-button:
  ACPI / button: fix defined but not used warning
  ACPI / button: increment wakeup count only when notified

* acpi-battery:
  ACPI / battery: Do not export energy_full[_design] on devices without full_charge_capacity
  ACPI / battery: get rid of negations in conditions
  ACPI / battery: use specialized print macros
  ACPI / battery: reorder headers alphabetically
  ACPI / battery: drop inclusion of init.h
  ACPI: battery: remove redundant old_present check on insertion

* acpi-osi:
  ACPI / OSI: Add OEM _OSI string to enable NVidia HDMI audio