Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Wed, 11 Feb 2009 09:03:53 +0000 (10:03 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 11 Feb 2009 09:03:53 +0000 (10:03 +0100)
commit4040068dce64f75c9d414f41fc2fb314a44bad65
tree10c4e51ddf9fb33112b773e56905d189909e35b0
parentd524e03207591a6de7e6b5069aabc778e3f0f5f8
parentc3706f005c3aaf570e71f0f083fdbb59a5a9fa2e
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
arch/x86/kernel/ftrace.c