Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Tue, 10 Feb 2009 12:58:28 +0000 (13:58 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 Feb 2009 12:58:28 +0000 (13:58 +0100)
commitae216dd239765afd592f65d94d8430244cf77ed1
treea8e203cd9260be48d07e1484f87023d7d3dbae64
parentf9915bfef3c64ea0b0b960dd1b999b584a7ef460
parent34cd4998d38f9bd04f34b78a7cb0c7f1bee00bd9
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace