Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Feb 2009 11:50:07 +0000 (12:50 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Feb 2009 11:50:07 +0000 (12:50 +0100)
commit2b1b858f690d6369a59ad241335eeedec6eb0c8c
tree91838f66d8ef6bb42fe66849c5cbd05650d272a3
parent886b5b73d71e4027d7dc6c14f5f7ab102201ea6b
parent1473e4417c79f12d91ef91a469699bfa911f510f
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace