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