Revert "Revert "Merge Samsung release N9005XXUFNF4 (Update 8)""

This reverts commit 2694315497ae7ae548c66744ba53ec13e10b3efe.

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/include/mach/msm_serial_hs.h