Ingo Molnar 141d3b1daa Merge branch 'linus' into x86/apic, to resolve conflicts ... Conflicts: arch/x86/include/asm/x2apic.h Signed-off-by: Ingo Molnar <mingo@kernel.org>		2017-11-07 10:51:10 +01:00
..
asm	Merge branch 'linus' into x86/apic, to resolve conflicts	2017-11-07 10:51:10 +01:00
uapi/asm	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00