Defconfig change

Conflicts:
	arch/arm/configs/cyanogenmod_quincyatt_defconfig