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

Merge branch 'x86/core' into perfcounters/core 

Conflicts:
	arch/x86/Kconfig
	arch/x86/kernel/apic.c
	arch/x86/kernel/setup_percpu.c
parents e9c4ffb1 7032e869
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment