Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Wed, 11 Feb 2009 09:03:11 +0000 (10:03 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 11 Feb 2009 09:03:11 +0000 (10:03 +0100)
1  2 
arch/x86/kernel/ftrace.c

Simple merge