git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Ingo Molnar <mingo@kernel.org>
	Thu, 5 Jun 2014 09:18:34 +0000 (11:18 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Thu, 5 Jun 2014 10:26:50 +0000 (12:26 +0200)
commit	8ec4549475d307b10f6bd7585bfa72aacf885741
tree	7037905737ae83a86a5cdb376cd1d66f7f407e2e	tree \| snapshot
parent	77c08c7029b30a70f2d47664a74a509067a47066	commit \| diff
parent	c96f4467e242ee737c809b9a8c078fcde57e9e05	commit \| diff

Merge branch 'perf/kprobes' into perf/core

Conflicts:
arch/x86/kernel/traps.c

The kprobes enhancements are fully cooked, ship them upstream.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Linux Kernel Source Tree.

RSS Atom

arch/x86/include/asm/traps.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_uprobe.c	diff1 \|	diff2 \|	blob \| history