]> 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: 554f786 480c93d)
Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
authorSteven Rostedt <srostedt@redhat.com>
Fri, 13 Mar 2009 01:12:46 +0000 (21:12 -0400)
committerSteven Rostedt <srostedt@redhat.com>
Fri, 13 Mar 2009 01:12:46 +0000 (21:12 -0400)
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.