Merge branch 'tracing/ftrace' into auto-ftrace-next

author Ingo Molnar <mingo@elte.hu>

Thu, 10 Jul 2008 09:43:00 +0000 (11:43 +0200)

committer Ingo Molnar <mingo@elte.hu>

Thu, 10 Jul 2008 09:43:00 +0000 (11:43 +0200)
author Ingo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 09:43:00 +0000 (11:43 +0200)
committer Ingo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 09:43:00 +0000 (11:43 +0200)
diff --cc Makefile
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/mm/init_64.c
Simple merge
diff --cc kernel/printk.c
Simple merge
diff --cc kernel/sched.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Thu, 10 Jul 2008 09:43:00 +0000 (11:43 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 10 Jul 2008 09:43:00 +0000 (11:43 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history