Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts
Conflicts:
arch/x86/kernel/cpu/Makefile
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
Loading
Please register or sign in to comment
Conflicts:
arch/x86/kernel/cpu/Makefile
Signed-off-by:
Ingo Molnar <mingo@kernel.org>