diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 14:43:16 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 14:43:16 +0200 |
| commit | acd448f300b71c0b358cee8d27b1c4244ff00470 (patch) | |
| tree | 7fd527664e6e2b8d83fc13f869768033d5c81df1 /include/acpi | |
| parent | 9a15da1b84c9907f1f491023c517aa79d1ea4958 (diff) | |
| parent | 5f155515d37351f90dbb1c8a5a5cae13190c8564 (diff) | |
| parent | 399e08f1f06693c6734f4a071573674369151ffd (diff) | |
| parent | 2ce6324eadb014136a4baaf7a174f47d771364a0 (diff) | |
| parent | 32c6f3ffa0182d7f1a8f3e385de3fef74bc27b24 (diff) | |
Merge branches 'acpi-tables', 'acpi-pmic', 'acpi-dptf' and 'acpi-soc'
* acpi-tables:
ACPI: NFIT: Use kobj_to_dev() instead
* acpi-pmic:
MAINTAINERS: Use my kernel.org address for Intel PMIC work
ACPI / PMIC: Move TPS68470 OpRegion driver to drivers/acpi/pmic/
ACPI / PMIC: Split out Kconfig and Makefile specific for ACPI PMIC
* acpi-dptf:
ACPI: DPTF: Add PCH FIVR participant driver
* acpi-soc:
ACPI: APD: Clean up header file include statements
ACPI: APD: Remove unnecessary APD_ADDR() macro stub
ACPI: APD: Remove ACPI_MODULE_NAME()
ACPI: APD: Remove flags from struct apd_device_desc
ACPI: APD: Add kerneldoc for properties in struct apd_device_desc