From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 5 Sep 2008 07:21:21 +0000 (+0200)
Subject: Merge branch 'x86/x2apic' into x86/core
X-Git-Tag: v2.6.28-rc1~711^2^2~44^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9042763808c5285a1a61b45b0fe98a710a4c903c;p=pandora-kernel.git

Merge branch 'x86/x2apic' into x86/core

Conflicts:
	arch/x86/kernel/cpu/common_64.c

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

9042763808c5285a1a61b45b0fe98a710a4c903c
Reading git-diff-tree failed