]> git.karo-electronics.de Git - karo-tx-linux.git/commit
manual merge of perf/uprobes
authorIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 11:54:29 +0000 (13:54 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 11:54:29 +0000 (13:54 +0200)
commit60ea7745de12721f83e3e6f3748f647376c379e4
tree82591620bea4b1e9f87c3848672fef6911db14bb
parent0fe4e1ee6231c07f3749fc87323b32378651b849
parenta03b1e1c372b60183b8141cdd161316429fab5ac
manual merge of perf/uprobes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/traps.h
arch/x86/kernel/process_64.c
arch/x86/kernel/traps.c
kernel/trace/trace_uprobe.c