Merge branch 'l7200' into devel

Conflicts:
	arch/arm/configs/lusl7200_defconfig