diff options
author | Ingo Molnar <mingo@kernel.org> | 2025-04-22 08:31:41 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2025-04-22 08:31:41 +0200 |
commit | c96f564e6f943cf5d8536e1c43f243aa7c42b4ed (patch) | |
tree | ada98ccab9b31fe9519b4e6ea2beec63ad98cb16 /scripts/lib/kdoc/kdoc_re.py | |
parent | 321550859f3bd64f547d0b4e9fbd97bd539ef47c (diff) | |
parent | 06e09002bc1d46505d6b3bd947ebaf3cec7acab8 (diff) |
Merge branch 'x86/cpu' into x86/microcode, to pick up dependent commits
Avoid a conflict in <asm/cpufeatures.h> by merging pending x86/cpu changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/lib/kdoc/kdoc_re.py')
0 files changed, 0 insertions, 0 deletions