]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commit81faaae45701484bd7368336e02f2a846153b22f
treed7d8dcafe5bb22decb0024537478fb667b0c896b
parentf69feff720497237ae9dd2f4604921bd3080c421
parent3c9339049df5cc3a468c11de6c4101a1ea8c3d83
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>
arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/kernel/ptrace.c
include/asm-x86/ds.h
include/asm-x86/processor.h
include/asm-x86/ptrace-abi.h
include/asm-x86/ptrace.h