Skip to content
Commit 42390cde authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/x2apic



Conflicts:
	arch/x86/kernel/cpu/cyrix.c
	include/asm-x86/cpufeature.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 11c231a9 d210baf5
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment