projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d67be9 1fd8df2)
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Tue, 5 Jul 2011 09:55:43 +0000 (11:55 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 5 Jul 2011 09:55:43 +0000 (11:55 +0200)
1  2 
kernel/trace/ftrace.c patch | diff1 | diff2 | blob | history
kernel/trace/trace_kprobe.c patch | diff1 | diff2 | blob | history

diff --cc kernel/trace/ftrace.c
Simple merge
diff --cc kernel/trace/trace_kprobe.c
Simple merge
Domain: System / Kernel;