Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/mm/cache-sh4.c