projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f701d35 5c6a3ae)
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Fri, 27 Feb 2009 08:06:11 +0000 (09:06 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 27 Feb 2009 08:06:11 +0000 (09:06 +0100)
commitda74ff0f9b31ed97104c22c278bf2b41bcf8f33c
treeaaaff8ca13625da1823204e1fee29774117f7bc7tree | snapshot (tar.gz zip)
parentf701d354075914296474d062f18fc8ee681a2318commit | diff
parent5c6a3ae1b4beebb56e2916b84f1208d96a9e32ffcommit | diff
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Conflicts:
kernel/sched_clock.c