git.stricted.de - GitHub/exynos8895/android_kernel_samsung_universal8895.git/commit

projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fb82ad7 85dfd81)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 11 Aug 2009 12:19:09 +0000 (14:19 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 11 Aug 2009 12:19:09 +0000 (14:19 +0200)
commit	89034bc2c7b839702c00a704e79d112737f98be0
tree	e65b1f3d4c751baa840efc81bc4734f089379eb3	tree \| snapshot (tar.gz zip)
parent	fb82ad719831db58e9baa4c67015aae3fe27e7e3	commit \| diff
parent	85dfd81dc57e8183a277ddd7a56aa65c96f3f487	commit \| diff

Merge branch 'linus' into tracing/core

Conflicts:
kernel/trace/trace_events_filter.c

We use the tracing/core version.

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

12 files changed:

include/linux/ftrace_event.h	diff1 \|	diff2 \|	blob \| history
include/trace/ftrace.h	diff1 \|	diff2 \|	blob \| history
kernel/kprobes.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/ftrace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/ring_buffer.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_events.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_functions_graph.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_stack.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_stat.c	diff1 \|	diff2 \|	blob \| history
scripts/recordmcount.pl	diff1 \|	diff2 \|	blob \| history