From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 21 Jan 2022 19:05:34 +0000 (+0100)
Subject: Merge branches 'acpi-cppc' and 'acpi-dptf'
X-Git-Tag: v5.17-rc1~13^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f6f02040e0ca7cb2e82d8aeb8f7daf5d89acc04c;p=users%2Fdwmw2%2Flinux.git

Merge branches 'acpi-cppc' and 'acpi-dptf'

Merge new ACPI CPPC driver updates and new Raptor Lake DPTF device
IDs for 5.17-rc1.

* acpi-cppc:
  ACPI: CPPC: Drop redundant local variable from cpc_read()
  ACPI: CPPC: Fix up I/O port access in cpc_read()

* acpi-dptf:
  ACPI: DPTF: Support Raptor Lake
---

f6f02040e0ca7cb2e82d8aeb8f7daf5d89acc04c