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

This commit is contained in:
Paul Mundt 2009-10-13 10:31:50 +09:00
commit 7a0064d672