git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4ad476e 57794a9)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 9 Feb 2009 09:35:12 +0000 (10:35 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 9 Feb 2009 09:35:12 +0000 (10:35 +0100)
commit	44b0635481437140b0e29d6023f05e805d5e7620
tree	ff31986115075410d0479df307a6b9841976026c	tree \| snapshot (tar.gz zip)
parent	4ad476e11f94fd3724c6e272d8220e99cd222b27	commit \| diff
parent	57794a9d48b63e34acbe63282628c9f029603308	commit \| diff

Merge branch 'tip/tracing/core/devel' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Conflicts:
kernel/trace/trace_hw_branches.c

include/linux/ring_buffer.h	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_hw_branches.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_output.c	diff1 \|	diff2 \|	blob \| history