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

Merge branch 'x86/uv' into x86/x2apic

Conflicts:

	arch/x86/kernel/Makefile

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

9553e11325e3d44a8c8a1428c7e5f146f1cc7238
Reading git-diff-tree failed