]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'acpi-properties'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Nov 2021 18:45:31 +0000 (19:45 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Nov 2021 18:45:31 +0000 (19:45 +0100)
Merge fix and cleanup related to the management of ACPI device
properties for 5.16-rc3.

* acpi-properties:
  ACPI: Make acpi_node_get_parent() local
  ACPI: Get acpi_device's parent from the parent field


Trivial merge