Merge branch 'sh/rsk-updates' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Thu, 10 May 2012 02:51:07 +0000 (11:51 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 10 May 2012 02:51:07 +0000 (11:51 +0900)
Conflicts:
arch/sh/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Trivial merge