Merge branch 'x86/pebs' into x86-v28-for-linus-phase1
authorIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 14:17:23 +0000 (16:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 14:17:23 +0000 (16:17 +0200)
Conflicts:
include/asm-x86/ds.h

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

Trivial merge