diff options
| author | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2024-03-12 12:51:10 +0200 |
|---|---|---|
| committer | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2024-03-12 12:51:10 +0200 |
| commit | 1c0a50de025d0d52825dfa5d7749c56ad6c4fa00 (patch) | |
| tree | 4afe7988034d8272e19d72c5c563faa44b12e7dc /drivers/platform/x86/intel/pmc/core.c | |
| parent | 30f96b2cb70d882515efae4d4af698f18a65c75e (diff) | |
| parent | 0314cebb29be2f961abb37bd0b01cb16899868f2 (diff) | |
Merge tag 'platform-drivers-x86-v6.8-4' into pdx86/for-next
Merge tag 'platform-drivers-x86-v6.8-4' fixes into pdx86/for-next to
resolve amd/pmf conflicts.
Diffstat (limited to 'drivers/platform/x86/intel/pmc/core.c')
0 files changed, 0 insertions, 0 deletions