tree d7d8dcafe5bb22decb0024537478fb667b0c896b
parent f69feff720497237ae9dd2f4604921bd3080c421
parent 3c9339049df5cc3a468c11de6c4101a1ea8c3d83
author Ingo Molnar <mingo@elte.hu> 1221027651 +0200
committer Ingo Molnar <mingo@elte.hu> 1221027651 +0200

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>