diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-08-14 10:17:28 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-08-14 10:17:28 +0200 |
| commit | 76f7d6c07acd7a694ccc97355d37637f6677de51 (patch) | |
| tree | 8039691acd50e311c4c02afd5a739caaee3c36cc /include | |
| parent | 3c94280456d9925a795e5d423330acac4b223823 (diff) | |
| parent | 2c4c2a71bd6f75c3982ac09407889b110673ac83 (diff) | |
| parent | b41901a2cf06f33c030be96c075872201089d47a (diff) | |
| parent | 887532ca7ca59fcf0547a79211756791128030a3 (diff) | |
| download | linux-76f7d6c07acd7a694ccc97355d37637f6677de51.tar.bz2 | |
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