Merge branches 'sh/urgent' and 'sh/platform-updates' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Fri, 27 Jan 2012 07:37:30 +0000 (16:37 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 27 Jan 2012 07:37:30 +0000 (16:37 +0900)

Trivial merge