diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-06 09:59:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-06 10:00:58 +0200 |
| commit | 24035886d735e4ce1c4605638adafe1fa2988e7a (patch) | |
| tree | 8c75625bc848a16bde8ce69e902c70c28e7d3da7 /drivers | |
| parent | 3aba0b40cacdfba4a604dd09315fa6cdbeb0ed90 (diff) | |
| parent | 92a09c47464d040866cf2b4cd052bc60555185fb (diff) | |
| download | linux-24035886d735e4ce1c4605638adafe1fa2988e7a.tar.gz linux-24035886d735e4ce1c4605638adafe1fa2988e7a.tar.bz2 linux-24035886d735e4ce1c4605638adafe1fa2988e7a.zip | |
Merge tag 'v6.15-rc5' into x86/cpu, to resolve conflicts
Conflicts:
tools/arch/x86/include/asm/cpufeatures.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers')