Merge commit 'ftrace/ppc' into merge