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