Update temasek defconfig

Conflicts:

	arch/arm/configs/temasek_defconfig