From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 23 Dec 2008 15:24:15 +0000 (+0100)
Subject: Merge branch 'x86/apic' into x86/irq
X-Git-Tag: v2.6.29-rc1~587^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf8bd66d0580f296f257d371ee41a0a137b541c7;p=pandora-kernel.git

Merge branch 'x86/apic' into x86/irq

Conflicts:
	arch/x86/kernel/apic.c
---

bf8bd66d0580f296f257d371ee41a0a137b541c7
Reading git-diff-tree failed