Merge branch 'x86/core' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 12:02:23 +0000 (13:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 12:02:23 +0000 (13:02 +0100)
Conflicts:
arch/x86/kernel/apic/apic.c
arch/x86/kernel/irqinit_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge