Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core
Ingo Molnar [Tue, 24 Feb 2009 17:22:39 +0000 (18:22 +0100)]
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
arch/ia64/Kconfig

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge