projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
kernel/sched_clock.c


Trivial merge