projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fb896a f9aa28a)
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Sun, 15 Feb 2009 19:08:55 +0000 (20:08 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 15 Feb 2009 19:08:55 +0000 (20:08 +0100)
Conflicts:
kernel/trace/trace_mmiotrace.c


Trivial merge