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

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

author	Steven Rostedt <srostedt@redhat.com>
	Fri, 21 May 2010 15:49:57 +0000 (11:49 -0400)
committer	Steven Rostedt <rostedt@goodmis.org>
	Fri, 21 May 2010 15:49:57 +0000 (11:49 -0400)
commit	2afaa86047cad9b866c735f4b588fbb7b22ba800
tree	d052553eb296dfee3f01b1cb2b717cb7ccf3127a	tree \| snapshot
parent	d6836102a2f1ea26e565142c98b17bb1bed4d633	commit \| diff
parent	aec23be747b86f6b890d11ce2b3f0e0131e14558	commit \| diff

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-7

Conflicts:
include/linux/ftrace_event.h
include/trace/ftrace.h
kernel/trace/trace_event_perf.c
kernel/trace/trace_kprobe.c
kernel/trace/trace_syscalls.c

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

Linux Kernel Source Tree.

RSS Atom

include/linux/ftrace_event.h	diff1 \|	diff2 \|	blob \| history
include/trace/ftrace.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_event_perf.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_kprobe.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_syscalls.c	diff1 \|	diff2 \|	blob \| history