Final fixes for Live OC

Conflicts:
	arch/arm/configs/mapphone_1GB_defconfig