projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 492f73a 14a8fd7)
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 07:32:40 +0000 (09:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 07:32:40 +0000 (09:32 +0200)
1  2 
kernel/trace/ftrace.c patch | diff1 | diff2 | blob | history
kernel/trace/trace.h patch | diff1 | diff2 | blob | history

diff --cc kernel/trace/ftrace.c
Simple merge
diff --cc kernel/trace/trace.h
Simple merge
John Crispins staging tree