Ingo Molnar e0cb4ebcd9 Merge branch 'tracing/urgent' into tracing/ftrace ... Conflicts: kernel/trace/trace.c		2008-11-11 09:40:18 +01:00
..
asm	Merge branch 'tracing/urgent' into tracing/ftrace	2008-11-11 09:40:18 +01:00