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)
commitd524e03207591a6de7e6b5069aabc778e3f0f5f8
treec98f206e8df11f8ecbdd74dba79c29d1f90dea5a
parentae216dd239765afd592f65d94d8430244cf77ed1
parent7d6d49b1f5551b87bd59c66c10747b89367760fd
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
arch/x86/kernel/ftrace.c