From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 31 Jan 2009 16:32:31 +0000 (+0100)
Subject: Merge branch 'x86/urgent' into x86/apic
X-Git-Tag: v2.6.30-rc1~211^2~26^2~2^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d45cf9e36bf9bcf16df6e1cbf049807c8402823;p=pandora-kernel.git

Merge branch 'x86/urgent' into x86/apic

Conflicts:
	arch/x86/mach-default/setup.c

Semantic merge:
	arch/x86/kernel/irqinit_32.c

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

9d45cf9e36bf9bcf16df6e1cbf049807c8402823
Reading git-diff-tree failed