From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 8 Jul 2008 07:53:57 +0000 (+0200)
Subject: Merge branch 'x86/irq' into x86/devel
X-Git-Tag: v2.6.27-rc1~1106^2~248
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b8ba39a3fad9c58532f6dad12c94d6e675be656;p=pandora-kernel.git

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

1b8ba39a3fad9c58532f6dad12c94d6e675be656
Reading git-diff-tree failed