Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable