Merge branch 'soc' into boards

Conflicts:
	arch/arm/configs/marzen_defconfig