Merge branch 'misc' into devel

Conflicts:
	arch/arm/Kconfig