Merge branch 'sh/st-integration'
authorPaul Mundt <lethal@linux-sh.org>
Mon, 24 Aug 2009 13:49:17 +0000 (22:49 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 24 Aug 2009 13:49:17 +0000 (22:49 +0900)

Trivial merge