From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 14 Aug 2018 08:17:28 +0000 (+0200)
Subject: Merge branches 'acpi-button', 'acpi-battery' and 'acpi-osi'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=76f7d6c07acd7a694ccc97355d37637f6677de51;p=linux.git

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
---

76f7d6c07acd7a694ccc97355d37637f6677de51