jf: kernel: merge I9505GUEUDNL3

Change-Id: Ic707296afd9992a00635f7ca6b845d25dce92fa2

Conflicts:
	arch/arm/mach-msm/Kconfig
	build-all.py
	include/linux/diagchar.h