]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'sh/ftrace' of git://github.com/mfleming/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Tue, 13 Oct 2009 01:31:50 +0000 (10:31 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 13 Oct 2009 01:31:50 +0000 (10:31 +0900)

Trivial merge