Merge branch 'sh/stable-updates'
authorPaul Mundt <lethal@linux-sh.org>
Mon, 21 Jun 2010 05:52:46 +0000 (14:52 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 21 Jun 2010 05:52:46 +0000 (14:52 +0900)

Trivial merge