Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Sun, 18 Jan 2009 19:15:05 +0000 (20:15 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 18 Jan 2009 19:15:05 +0000 (20:15 +0100)
commit4092762aebfe55c1f8e31440b80a053c2dbe519b
tree8fb9fd14131194174c12daf5d8195afd3b62bc3e
parent745b1626dd71ce9661a05ea4db57859ed5c773d2
parent1de9e8e70f5acc441550ca75433563d91b269bbe
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
Documentation/sysrq.txt
MAINTAINERS
arch/ia64/Kconfig
arch/ia64/kernel/entry.S
drivers/char/sysrq.c