From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 25 Jul 2008 09:37:07 +0000 (+0200)
Subject: Merge branch 'linus' into x86/pebs
X-Git-Tag: v2.6.28-rc1~734^2~3^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e2f65ee30eee2db054f7fd73f462c5da33ec963;p=pandora-kernel.git

Merge branch 'linus' into x86/pebs

Conflicts:

	arch/x86/Kconfig.cpu
	arch/x86/kernel/cpu/intel.c
	arch/x86/kernel/setup_64.c

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

0e2f65ee30eee2db054f7fd73f462c5da33ec963
Reading git-diff-tree failed