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

Merge branch 'x86/core' into perfcounters/core 



Conflicts:
	arch/x86/kernel/apic/apic.c
	arch/x86/kernel/irqinit_32.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 742bd95b ecc25fbd
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