clean up

Conflicts:
	arch/arm/configs/cyanogenmod_i9305_defconfig
	arch/arm/configs/cyanogenmod_n5100_defconfig
	arch/arm/configs/cyanogenmod_n5110_defconfig
	arch/arm/configs/cyanogenmod_t0ltecdma_defconfig
	arch/arm/configs/m0_00_defconfig