]> err.no Git - linux-2.6/commitdiff
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)
Conflicts:

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

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge