Merge branch 'tracing/urgent' into tracing/ftrace

author Ingo Molnar <[email protected]>

Tue, 7 Apr 2009 12:41:14 +0000 (14:41 +0200)

committer Ingo Molnar <[email protected]>

Tue, 7 Apr 2009 12:41:17 +0000 (14:41 +0200)
author Ingo Molnar <[email protected]>
Tue, 7 Apr 2009 12:41:14 +0000 (14:41 +0200)
committer Ingo Molnar <[email protected]>
Tue, 7 Apr 2009 12:41:17 +0000 (14:41 +0200)
diff --cc block/blk-core.c
Simple merge
diff --cc include/linux/ftrace.h
Simple merge
diff --cc include/linux/init_task.h
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
diff --cc kernel/trace/trace.h
Simple merge
diff --cc kernel/trace/trace_output.c
Simple merge
author	Ingo Molnar <[email protected]>
	Tue, 7 Apr 2009 12:41:14 +0000 (14:41 +0200)
committer	Ingo Molnar <[email protected]>
	Tue, 7 Apr 2009 12:41:17 +0000 (14:41 +0200)
		1	2
block/blk-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/ftrace.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/init_task.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_output.c	patch \|	diff1 \|	diff2 \|	blob \| history