Merge branch 'perf' into devel

Conflicts:
	arch/arm/Kconfig