diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-01-21 20:05:34 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-01-21 20:05:34 +0100 |
| commit | f6f02040e0ca7cb2e82d8aeb8f7daf5d89acc04c (patch) | |
| tree | e401ae07734e581350f3bc8476802a05d4821319 /drivers/crypto/qat/qat_common/Makefile | |
| parent | 6a8d7fbf1c65034b85e7676b42449a56e4206bd3 (diff) | |
| parent | f684b10751287e8b7e15e8f10ae40bdd74149bba (diff) | |
| parent | a510c78e5b6f2f9b9add88071fdfc2b740d2e356 (diff) | |
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