projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c71dd42 6d102bc 3d9101e)
Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into...
authorIngo Molnar <mingo@elte.hu>
Fri, 19 Dec 2008 08:42:40 +0000 (09:42 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 19 Dec 2008 08:42:40 +0000 (09:42 +0100)
commit30cd324e9787ccc9a5ede59742d5409857550692
treee53027e0283119de0ef4c3a431b1d20cd43003fbtree | snapshot (tar.gz zip)
parentc71dd42db2c6f1637b92502a214587431c1a6ad2commit | diff
parent6d102bc68f3dd2ae0e305b09170b1751aa67baebcommit | diff
parent3d9101e92529e1ff6014f95a69afc82f37b9b13acommit | diff
Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core

Conflicts:
include/linux/ftrace.h
include/linux/ftrace.h diff1 | diff2 | diff3 | blob | history
kernel/fork.c diff1 | diff2 | diff3 | blob | history
kernel/sched.c diff1 | diff2 | diff3 | blob | history
kernel/trace/trace.c diff1 | diff2 | diff3 | blob | history