From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 10 Sep 2008 06:20:51 +0000 (+0200)
Subject: Merge branch 'x86/pebs' into x86/unify-cpu-detect
X-Git-Tag: v2.6.28-rc1~711^2^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81faaae45701484bd7368336e02f2a846153b22f;p=pandora-kernel.git

Merge branch 'x86/pebs' into x86/unify-cpu-detect

Conflicts:
	arch/x86/Kconfig.cpu
	include/asm-x86/ds.h

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

81faaae45701484bd7368336e02f2a846153b22f
Reading git-diff-tree failed