Final Linaro Fixes

Conflicts:
	arch/arm/configs/ville_defconfig