From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Jul 2008 21:00:05 +0000 (+0200)
Subject: Merge branch 'x86/apic' into x86/x2apic
X-Git-Tag: v2.6.28-rc1~699^2^8~23^2~9^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=453c1404c5273a30d715e5a83372a78cff70b6d9;p=pandora-kernel.git

Merge branch 'x86/apic' into x86/x2apic

Conflicts:

	arch/x86/kernel/paravirt.c
	arch/x86/kernel/smpboot.c
	arch/x86/kernel/vmi_32.c
	arch/x86/lguest/boot.c
	arch/x86/xen/enlighten.c
	include/asm-x86/apic.h
	include/asm-x86/paravirt.h

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

453c1404c5273a30d715e5a83372a78cff70b6d9
Reading git-diff-tree failed