Merge branches 'sh/compressors' and 'sh/ftrace'
authorPaul Mundt <lethal@linux-sh.org>
Sun, 12 Jul 2009 15:45:25 +0000 (11:45 -0400)
committerPaul Mundt <lethal@linux-sh.org>
Sun, 12 Jul 2009 15:45:25 +0000 (11:45 -0400)

Trivial merge