Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Wed, 18 Feb 2009 00:08:13 +0000 (01:08 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 18 Feb 2009 00:08:13 +0000 (01:08 +0100)
1  2 
kernel/trace/ftrace.c

Simple merge