Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
Ingo Molnar [Sun, 18 Jan 2009 19:15:05 +0000 (20:15 +0100)]
1  2 
Documentation/sysrq.txt
MAINTAINERS
arch/ia64/Kconfig
arch/ia64/kernel/entry.S
drivers/char/sysrq.c

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge