]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22de89b 5087f8d)
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Fri, 20 Mar 2009 09:15:13 +0000 (10:15 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 20 Mar 2009 09:15:13 +0000 (10:15 +0100)
1  2 
kernel/trace/trace.c patch | diff1 | diff2 | blob | history

diff --cc kernel/trace/trace.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.