Merge branch 'x86/irq' into x86/devel
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 07:53:57 +0000 (09:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 07:53:57 +0000 (09:53 +0200)
commit1b8ba39a3fad9c58532f6dad12c94d6e675be656
tree9ae9b4c4545b4c91f5dbb3a1085c4c721961c4f2
parent58cf35228fec541418cc3bd781d6c069d904815e
parentcbd6712406a3ea861b49fbfd46e23cbf5f8e073f
Merge branch 'x86/irq' into x86/devel

Conflicts:

arch/x86/kernel/i8259.c
arch/x86/kernel/irqinit_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/apic_32.c
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/io_apic_64.c
arch/x86/kernel/irq_32.c