Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core

author Ingo Molnar <mingo@elte.hu>

Wed, 4 Mar 2009 10:14:47 +0000 (11:14 +0100)

committer Ingo Molnar <mingo@elte.hu>

Wed, 4 Mar 2009 10:14:47 +0000 (11:14 +0100)
author Ingo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 10:14:47 +0000 (11:14 +0100)
committer Ingo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 10:14:47 +0000 (11:14 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/mm/init_64.c
Simple merge
diff --cc include/linux/sched.h
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/sched.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 4 Mar 2009 10:14:47 +0000 (11:14 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 4 Mar 2009 10:14:47 +0000 (11:14 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history