]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit696516d86a5de805c2fc09ce183b4d43567e574d
tree9ae9b4c4545b4c91f5dbb3a1085c4c721961c4f2
parent5c59df325ba3f5b4c9538711049ddc759e122dbf
parent257678aaed429daca0dc9b4fde63b03c4e93e9ea
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