tree 56f98892d1bd38029988eb8931e2321ef7e79aa0
parent b2212ea41dacda8cce0e7681a3a6ccc76c63802e
parent 41797f75486d8ca3b98d7658c2a506ac7879a8e5
author Paul Mundt <lethal@linux-sh.org> 1336618267 +0900
committer Paul Mundt <lethal@linux-sh.org> 1336618267 +0900

Merge branch 'sh/rsk-updates' into sh-latest

Conflicts:
	arch/sh/Kconfig

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