Merge branch 'sh/lmb'
authorPaul Mundt <lethal@linux-sh.org>
Thu, 13 May 2010 08:48:05 +0000 (17:48 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 13 May 2010 08:48:05 +0000 (17:48 +0900)
Conflicts:
arch/sh/kernel/setup.c


Trivial merge