diff options
| author | Rafael J. Wysocki <[email protected]> | 2025-08-14 11:09:27 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2025-08-14 11:09:27 +0000 |
| commit | 40f2f1aa62578547e2977e8c0516048e0b71018c (patch) | |
| tree | 5160e1fc54442b2e1c14c2c9a3c157e27a79e1e2 /scripts/git-resolve.sh | |
| parent | ACPI: EC: Relax sanity check of the ECDT ID string (diff) | |
| parent | ACPI: processor: perflib: Move problematic pr->performance check (diff) | |
| download | kernel-40f2f1aa62578547e2977e8c0516048e0b71018c.tar.gz kernel-40f2f1aa62578547e2977e8c0516048e0b71018c.zip | |
Merge branches 'acpi-ec' and 'acpi-processor'
* acpi-ec:
ACPI: EC: Relax sanity check of the ECDT ID string
* acpi-processor:
ACPI: processor: perflib: Move problematic pr->performance check
Diffstat (limited to 'scripts/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions