Merge branch 'linus' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/include/asm/x2apic.h
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
Loading
Please register or sign in to comment
Conflicts:
arch/x86/include/asm/x2apic.h
Signed-off-by:
Ingo Molnar <mingo@kernel.org>