tree 7d08afd30c95c04129c20693d974a18799caeb5a
parent 742bd95ba96e19b3f7196c3a0834ebc17c8ba006
parent ecc25fbd6b9e07b33895c61ddf84006b00f55d99
author Ingo Molnar <mingo@elte.hu> 1235649743 +0100
committer Ingo Molnar <mingo@elte.hu> 1235649743 +0100

Merge branch 'x86/core' into perfcounters/core

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

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