Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Mon, 2 Mar 2009 22:14:02 +0000 (23:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 2 Mar 2009 22:14:02 +0000 (23:14 +0100)
commit654952bcb999ad96e1d9ae9145fe5c0522ec297a
tree1c313f5444397a86bdb4d6600ee503d6f75dc9f1
parented662d9b2a6cb26e1399f57b88b565c0a68c60d4
parentc79a61f55773d2519fd0525bf58385f7d20752d3
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace