]> Pileus Git - ~andy/linux/commitdiff
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)

Trivial merge