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)
commitef4ed97d6bd91aa41907181e80a7feaf2721719a
treeadc44e858c150c41ebf1dd7c6ee2f6bcbac75502
parentc5eb5b372e7ea18a5eeb6b5192a6369967cb1afe
parent21823259a70b7a2a21eea1d48c25a6f38896dd11
Merge branch 'sh/lmb'

Conflicts:
arch/sh/kernel/setup.c
arch/sh/kernel/machine_kexec.c
arch/sh/kernel/setup.c