projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e02c4fd 0e95017)
Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <[email protected]>
Thu, 11 Mar 2010 12:39:33 +0000 (13:39 +0100)
committerIngo Molnar <[email protected]>
Thu, 11 Mar 2010 12:39:33 +0000 (13:39 +0100)
1  2 
kernel/trace/ftrace.c patch | diff1 | diff2 | blob | history
kernel/trace/trace.c patch | diff1 | diff2 | blob | history

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