Merge branch 'tracing/ftrace' into auto-ftrace-next
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 13:58:35 +0000 (15:58 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 13:58:35 +0000 (15:58 +0200)
1  2 
kernel/trace/trace.c
kernel/trace/trace.h

Simple merge
Simple merge