Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'tracing/textedi...

author Ingo Molnar <mingo@elte.hu>

Sun, 8 Mar 2009 15:48:51 +0000 (16:48 +0100)

committer Ingo Molnar <mingo@elte.hu>

Sun, 8 Mar 2009 15:48:51 +0000 (16:48 +0100)
author Ingo Molnar <mingo@elte.hu>
Sun, 8 Mar 2009 15:48:51 +0000 (16:48 +0100)
committer Ingo Molnar <mingo@elte.hu>
Sun, 8 Mar 2009 15:48:51 +0000 (16:48 +0100)
diff --cc include/asm-generic/vmlinux.lds.h
Simple merge
diff --cc lib/Kconfig
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Sun, 8 Mar 2009 15:48:51 +0000 (16:48 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 8 Mar 2009 15:48:51 +0000 (16:48 +0100)
		1	2
include/asm-generic/vmlinux.lds.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history