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

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