Merge branch 'x86/apic' into x86/irq
authorIngo Molnar <mingo@elte.hu>
Tue, 23 Dec 2008 15:24:15 +0000 (16:24 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 23 Dec 2008 15:24:15 +0000 (16:24 +0100)
Conflicts:
arch/x86/kernel/apic.c


Trivial merge