Ingo Molnar 9676e73a9e Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core ... Conflicts: kernel/trace/ftrace.c [ We conflicted here because we backported a few fixes to tracing/urgent - which has different internal APIs. ]		2008-11-19 10:04:25 +01:00
..
asm	Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core	2008-11-19 10:04:25 +01:00