Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/Kconfig