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>

Trivial merge