Merge branch 'linus' into tracing/ftrace

author Ingo Molnar <mingo@elte.hu>

Thu, 30 Oct 2008 23:38:21 +0000 (00:38 +0100)

committer Ingo Molnar <mingo@elte.hu>

Thu, 30 Oct 2008 23:38:21 +0000 (00:38 +0100)
author Ingo Molnar <mingo@elte.hu>
Thu, 30 Oct 2008 23:38:21 +0000 (00:38 +0100)
committer Ingo Molnar <mingo@elte.hu>
Thu, 30 Oct 2008 23:38:21 +0000 (00:38 +0100)
diff --cc include/linux/ftrace.h
Simple merge
diff --cc kernel/sysctl.c
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Thu, 30 Oct 2008 23:38:21 +0000 (00:38 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 30 Oct 2008 23:38:21 +0000 (00:38 +0100)
		1	2
include/linux/ftrace.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	patch \|	diff1 \|	diff2 \|	blob \| history