Merge branch 'tracing/ftrace' into tracing/urgent

author Ingo Molnar <mingo@elte.hu>

Wed, 22 Oct 2008 07:08:14 +0000 (09:08 +0200)

committer Ingo Molnar <mingo@elte.hu>

Wed, 22 Oct 2008 07:08:14 +0000 (09:08 +0200)
author Ingo Molnar <mingo@elte.hu>
Wed, 22 Oct 2008 07:08:14 +0000 (09:08 +0200)
committer Ingo Molnar <mingo@elte.hu>
Wed, 22 Oct 2008 07:08:14 +0000 (09:08 +0200)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/powerpc/Kconfig
Simple merge
diff --cc arch/sparc64/Kconfig
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/kernel/Makefile
Simple merge
diff --cc arch/x86/kernel/entry_32.S
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc kernel/sysctl.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 22 Oct 2008 07:08:14 +0000 (09:08 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 22 Oct 2008 07:08:14 +0000 (09:08 +0200)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/sparc64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_32.S	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	patch \|	diff1 \|	diff2 \|	blob \| history