ree 4c7f7471005b4436d40ba52edd51214d12331f25
parent 8ae936690972dfcad73d0dde1095b9f32af5ee95
parent 1ccedb7cdba6886939dd8b4c8f965a826f696e56
author Ingo Molnar <mingo@elte.hu> 1230045855 +0100
committer Ingo Molnar <mingo@elte.hu> 1230045855 +0100

Merge branch 'x86/apic' into x86/irq

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