diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:52:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:52:51 +0100 |
| commit | 9cea0d46f52f31c077a83a9b9e4e3887adfbecbe (patch) | |
| tree | 3910cec9563476f23108de6618ad55cf0c87e62a /scripts/Makefile.lib | |
| parent | 8c490b42fe91c10d5756efe56014240c669e7720 (diff) | |
| parent | 08f253ec3767bcfafc5d32617a92cee57c63968e (diff) | |
| download | linux-9cea0d46f52f31c077a83a9b9e4e3887adfbecbe.tar.bz2 | |
Merge branch 'x86/cpu' into x86/core, to resolve conflicts
Conflicts:
arch/x86/include/asm/cpufeatures.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/Makefile.lib')
0 files changed, 0 insertions, 0 deletions