Merge branch 'x86/pebs' into x86/unify-cpu-detect
authorIngo Molnar <mingo@elte.hu>
Wed, 10 Sep 2008 06:20:51 +0000 (08:20 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 10 Sep 2008 06:20:51 +0000 (08:20 +0200)
Conflicts:
arch/x86/Kconfig.cpu
include/asm-x86/ds.h

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

Trivial merge