Changes for fast charge and deep idle

Conflicts:
	arch/arm/configs/cyanogenmod_galaxys4gmtd_defconfig
	drivers/input/misc/yas529.c
	drivers/video/samsung/s3cfb.c
added filed for fast charge and deepidle that weren't pushed