Skip to content
Commit acd448f3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment