git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcef788 93cfb3c)
Merge branch 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Fri, 10 Apr 2009 10:46:28 +0000 (12:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Apr 2009 10:46:51 +0000 (12:46 +0200)
Merge reason: pick up both v2.6.30-rc1 [which includes tracing/urgent fixes]
              and pick up the current lineup of tracing/urgent fixes as well

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

diff --cc include/linux/ftrace.h
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
Pandora Kernel Repository