Merge branches 'sh/ftrace' and 'sh/stable-updates'
authorPaul Mundt <lethal@linux-sh.org>
Sat, 11 Jul 2009 01:08:33 +0000 (10:08 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Sat, 11 Jul 2009 01:08:33 +0000 (10:08 +0900)

Trivial merge