Skip to content
Commit aa3341a1 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'x86/cpu' into x86/x2apic 

Conflicts:

	arch/x86/kernel/cpu/feature_names.c
	include/asm-x86/cpufeature.h
parents 42390cde af2e1f27
Hide whitespace changes
Inline Side-by-side
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