Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Sat, 28 Feb 2009 09:15:58 +0000 (10:15 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 28 Feb 2009 09:15:58 +0000 (10:15 +0100)
commitacdb2c287916ce247c09d460266370af45da55c5
treee09d6f8fa8f2b28d363374d027f9b4af1d3888cb
parente9abf4c59d75cd71f118764376d037a677f573d0
parentf2034f1e1adaac6713a6d48b5a2d4f3aa3e63ccb
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace