git.stricted.de - GitHub/LineageOS/android_kernel_samsung_universal7580.git/commit

projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5a209c2 86fa2f6 6d5b43a)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 19 Nov 2008 09:04:25 +0000 (10:04 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 19 Nov 2008 09:04:25 +0000 (10:04 +0100)
commit	9676e73a9e0cbdc521e1ebf4e13e6e5aada34247
tree	b5ea1cace6c4f2f57fcebfc42418b7f53fee84e5	tree \| snapshot (tar.gz zip)
parent	5a209c2d58e70f9bc415b9cdf0e3b9aaefb70371	commit \| diff
parent	86fa2f60674540df0b34f5c547ed0c1cf3a8f212	commit \| diff
parent	6d5b43a67accf6793ed259f6534b4bd53b1e5696	commit \| diff

Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

Conflicts:
kernel/trace/ftrace.c

[ We conflicted here because we backported a few fixes to
tracing/urgent - which has different internal APIs. ]

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	diff3 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	diff3 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	diff3 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
kernel/trace/ring_buffer.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	diff3 \|	blob \| history