diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:35:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:35:27 +0200 |
| commit | 821f82125c47217390099532b09bd09cee9adaac (patch) | |
| tree | 26b526b4ffa17e5bd302381bff5d4bbadfe1299d /arch/x86/kernel/acpi/cppc.c | |
| parent | Merge branch 'x86/bugs' into x86/core, to merge dependent commits (diff) | |
| parent | x86/sev: Disentangle #VC handling code from startup code (diff) | |
| download | linux-821f82125c47217390099532b09bd09cee9adaac.tar.gz linux-821f82125c47217390099532b09bd09cee9adaac.zip | |
Merge branch 'x86/boot' into x86/core, to merge dependent commits
Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:
6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/acpi/cppc.c')
0 files changed, 0 insertions, 0 deletions