]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3215508 06e0900)
Merge branch 'x86/cpu' into x86/microcode, to pick up dependent commits
authorIngo Molnar <mingo@kernel.org>
Tue, 22 Apr 2025 06:31:41 +0000 (08:31 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 22 Apr 2025 06:31:41 +0000 (08:31 +0200)
Avoid a conflict in <asm/cpufeatures.h> by merging pending x86/cpu changes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.