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

author Ingo Molnar <mingo@elte.hu>

Sun, 18 Jan 2009 19:15:05 +0000 (20:15 +0100)

committer Ingo Molnar <mingo@elte.hu>

Sun, 18 Jan 2009 19:15:05 +0000 (20:15 +0100)
author Ingo Molnar <mingo@elte.hu>
Sun, 18 Jan 2009 19:15:05 +0000 (20:15 +0100)
committer Ingo Molnar <mingo@elte.hu>
Sun, 18 Jan 2009 19:15:05 +0000 (20:15 +0100)
diff --cc Documentation/sysrq.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc arch/ia64/Kconfig
Simple merge
diff --cc arch/ia64/kernel/entry.S
Simple merge
diff --cc drivers/char/sysrq.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Sun, 18 Jan 2009 19:15:05 +0000 (20:15 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 18 Jan 2009 19:15:05 +0000 (20:15 +0100)
		1	2
Documentation/sysrq.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/entry.S	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/sysrq.c	patch \|	diff1 \|	diff2 \|	blob \| history