projects / platform / kernel / linux-3.10.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c96c14 bf7c5b4)
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorIngo Molnar <mingo@elte.hu>
Tue, 13 Oct 2009 10:03:08 +0000 (12:03 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 13 Oct 2009 10:03:08 +0000 (12:03 +0200)
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
Domain: System / Kernel;