diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-09-17 10:52:21 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-09-17 10:52:21 +0300 |
commit | 0b3e7973128528e804b05dd7f79d54c2792318d6 (patch) | |
tree | bd8521d4b6cb98cc9fc79243b769676e3152b81e /include/acpi/acpixf.h | |
parent | a781f3930bd5e7e7614b3f20d705233018a7616a (diff) | |
parent | e88c7409c983fb611f783918c270cd18c11a6c50 (diff) | |
parent | 2b2d4247e445b97113c5e61df8fbc0d756482ef8 (diff) | |
download | linux-0b3e7973128528e804b05dd7f79d54c2792318d6.tar.xz |
Merge branches 'acpi-misc' and 'acpi-doc'
* acpi-misc:
ACPI: thermal: Remove redundant acpi_has_method() calls
ACPI: SBS: remove unused const variable 'SMBUS_PEC'
* acpi-doc:
Documentation: ACPI: DSD: Convert LED documentation to ReST