Merge branch 'tw-4.2.2' of github.com:Alucard24/samsung-kernel-jfltexx into my-tw-4.2.2

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/fastchg.c
	block/Kconfig.iosched
	block/Makefile
	block/bfq-cgroup.c
	block/bfq-iosched.c
	block/bfq.h
	block/fiops-iosched.c
	block/row-iosched.c
	block/sio-iosched.c
	drivers/exfat/exfat_super.c
	drivers/gpu/msm/Kconfig
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c
	include/linux/blk_types.h
	include/linux/fastchg.h