Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 10:02:40 +0000 (11:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 10:02:40 +0000 (11:02 +0100)
commit5fb896a4e916e72efec4772b66be1cce3d6a9143
tree693c06edca6c987846d5e8a478417d252ea28420
parentd351c8db95953b1b673de3966cb39640dc6c2f5f
parent2a7b8df04c11a70105c1abe67d006455d3bdc944
Merge branch 'tip/tracing/core' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace