From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 10 Apr 2009 12:58:05 +0000 (+0200)
Subject: x86, irqinit: preempt merge conflicts
X-Git-Tag: v2.6.31-rc1~423^2~23^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47f16ca7631f9c6bad8e6d968cfb1433029b09ec;p=pandora-kernel.git

x86, irqinit: preempt merge conflicts

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>
---

Reading git-diff-tree failed