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

This commit is contained in:
Paul Mundt 2009-06-12 01:12:44 +03:00
commit cf64c800f0