Merge branch 'x86/apic' into x86/core
authorIngo Molnar <mingo@elte.hu>
Thu, 14 Aug 2008 13:13:47 +0000 (15:13 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 14 Aug 2008 13:13:47 +0000 (15:13 +0200)
commit881b374705f352725ba1f558968ef34c17ba900e
treed7286c00d109db65662af1435fe3b5c8868814d2
parentc83d12806b6185131ece682de8696d8cfb78df69
parentd4c63ec060f3315653c0ae5bc3a7fe2419a2282f
Merge branch 'x86/apic' into x86/core
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/io_apic_64.c
include/asm-x86/hw_irq.h