projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 925936e 3397409)
Merge branch 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 1 Oct 2009 09:20:33 +0000 (11:20 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 1 Oct 2009 09:20:48 +0000 (11:20 +0200)
Merge reason: Pick up latest fixes and update to latest upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
kernel/trace/ftrace.c patch | diff1 | diff2 | blob | history
kernel/trace/trace.h patch | diff1 | diff2 | blob | history
kernel/trace/trace_events.c patch | diff1 | diff2 | blob | history

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