Ingo Molnar c478f87869 Merge branch 'tip/x86/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace ... Conflicts: include/linux/ftrace.h kernel/trace/ftrace.c		2009-02-22 18:12:01 +01:00
..
asm	Merge branch 'tip/x86/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace	2009-02-22 18:12:01 +01:00