projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6016ee1 86397dc)
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Thu, 19 Aug 2010 10:48:09 +0000 (12:48 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 19 Aug 2010 10:48:09 +0000 (12:48 +0200)
1  2 
include/linux/perf_event.h patch | diff1 | diff2 | blob | history
kernel/perf_event.c patch | diff1 | diff2 | blob | history
kernel/trace/trace_functions_graph.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/perf_event.h
Simple merge
diff --cc kernel/perf_event.c
Simple merge
diff --cc kernel/trace/trace_functions_graph.c
Simple merge