Merge branch 'sh/st-integration' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Tue, 15 Feb 2011 07:48:28 +0000 (16:48 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 15 Feb 2011 07:48:28 +0000 (16:48 +0900)

Trivial merge