Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Thu, 5 Mar 2009 09:21:49 +0000 (10:21 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 5 Mar 2009 09:21:49 +0000 (10:21 +0100)
commit53664738c122bfe8b0e489fddaf2ab265c9133c8
tree8121a9fc4021e86499c404e0b1012a36e8d0b00e
parentc4ef144a9d0803eb0a2d4110ae87e7f34e667ded
parente9d25fe6eaa2c720bb3ea661b660e58d54fa38bf
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace