x86, irqinit: preempt merge conflicts
authorIngo Molnar <mingo@elte.hu>
Fri, 10 Apr 2009 12:58:05 +0000 (14:58 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Apr 2009 14:26:43 +0000 (16:26 +0200)
To make the topic merge life easier for tip:perfcounters/core,
include two (inactive in this topic) IRQ vector initializations
here.

Also fix build bug - missing kprobes.h inclusion.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

No differences found