Merge branch 'sh/ftrace' of git://github.com/mfleming/linux-2.6