Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 24 Feb 2009 17:22:39 +0000 (18:22 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 24 Feb 2009 17:22:39 +0000 (18:22 +0100)
commita7f4463e0300b5135c0f0caf7c34a0529405f986
tree8df5f13094778eff3c8653bcc249cd265378b80a
parentc478f8786973d6d7552c652ddad3f6fd86b5af28
parent20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core
Documentation/kernel-parameters.txt
MAINTAINERS
arch/ia64/Kconfig