From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 11 Aug 2008 09:19:20 +0000 (+0200)
Subject: Merge branch 'linus' into x86/x2apic
X-Git-Tag: v2.6.28-rc1~711^2~1^2~33^2~2^3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8067794bec1cc5de1431102cf0a6a1c7ce75cd85;p=pandora-kernel.git

Merge branch 'linus' into x86/x2apic

Conflicts:

	arch/x86/kernel/genapic_64.c

Manual merge:

	arch/x86/kernel/genx2apic_uv_x.c

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

8067794bec1cc5de1431102cf0a6a1c7ce75cd85
Reading git-diff-tree failed