Merge branch 'tracing/urgent' into tracing/ftrace
Ingo Molnar [Tue, 7 Apr 2009 12:41:14 +0000 (14:41 +0200)]
1  2 
block/blk-core.c
include/linux/ftrace.h
include/linux/init_task.h
kernel/trace/trace.c
kernel/trace/trace.h
kernel/trace/trace_output.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge