Merge branch 'master' into sh/cachetlb

Conflicts:
	arch/sh/kernel/Makefile_64