Merge branch 'sh/ftrace' of git://github.com/mfleming/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Thu, 11 Jun 2009 22:12:44 +0000 (01:12 +0300)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 11 Jun 2009 22:12:44 +0000 (01:12 +0300)
commitcf64c800f0673cee7e36d7a97e2a1b575385b3db
tree5c0566f3e4c74bff455d54a9b2e7d7e55d26ecf8
parent512626a04e72aca60effe111fa0333ed0b195d21
parent9e28c46b7dd116a607ffb054c5545c468c77d779
Merge branch 'sh/ftrace' of git://github.com/mfleming/linux-2.6