]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'tracing/mmiotrace' into auto-ftrace-next
authorIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 09:43:06 +0000 (11:43 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 09:43:06 +0000 (11:43 +0200)
1  2 
kernel/trace/trace.c
kernel/trace/trace.h

Simple merge
Simple merge