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

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

author	Ingo Molnar <mingo@elte.hu>
	Wed, 26 Aug 2009 06:29:02 +0000 (08:29 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 26 Aug 2009 06:29:02 +0000 (08:29 +0200)
commit	b32a8ee194a78b971b9f67fe4a74cc31f03ffc02
tree	e34a37de965a79a2ae301de4d0557f500111dde6	tree \| snapshot
parent	2fd8816b930744a8760ba92843180a352bbd2849	commit \| diff
parent	435850808b13d3f71569539013a3ec2d62586f59	commit \| diff

Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core

Conflicts:
include/linux/tracepoint.h

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

Linux Kernel Source Tree.

RSS Atom

include/linux/tracepoint.h	diff1 \|	diff2 \|	blob \| history
include/trace/define_trace.h	diff1 \|	diff2 \|	blob \| history
include/trace/ftrace.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_syscalls.c	diff1 \|	diff2 \|	blob \| history