From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 12 Oct 2008 10:35:23 +0000 (+0200)
Subject: Merge branch 'linus' into x86/xen
X-Git-Tag: v2.6.28-rc1~699^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=365d46dc9be9b3c833990a06f3994b1987eda578;p=pandora-kernel.git

Merge branch 'linus' into x86/xen

Conflicts:
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/process_64.c
	arch/x86/xen/enlighten.c
---

365d46dc9be9b3c833990a06f3994b1987eda578
Reading git-diff-tree failed