Merge branch 'x86/irq' into x86/core
authorIngo Molnar <mingo@elte.hu>
Tue, 23 Dec 2008 15:30:31 +0000 (16:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 23 Dec 2008 15:30:31 +0000 (16:30 +0100)
commitbed4f13065b520e564adffbfcd1c1a764a9c887e
treed847ddd3bab64cb126ee6679dc4a949386554d55
parent3e5621edb3392b28efb260ac99b2d26fb8b44e73
parentbf8bd66d0580f296f257d371ee41a0a137b541c7
Merge branch 'x86/irq' into x86/core
arch/x86/kernel/apic.c
arch/x86/kernel/smp.c
arch/x86/kernel/time_64.c
arch/x86/kernel/tlb_32.c
arch/x86/kernel/traps.c