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)
commit15f99cbd071aa402e113d342448603344a337046
tree56f98892d1bd38029988eb8931e2321ef7e79aa0
parentb2212ea41dacda8cce0e7681a3a6ccc76c63802e
parent41797f75486d8ca3b98d7658c2a506ac7879a8e5
Merge branch 'sh/rsk-updates' into sh-latest

Conflicts:
arch/sh/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
MAINTAINERS
arch/sh/Kconfig
arch/sh/boards/Kconfig
arch/sh/include/asm/processor.h
arch/sh/kernel/cpu/proc.c