Updates from Ng2 Source drop on G900F model

Conflicts:
	arch/arm/configs/msm8974_sec_defconfig

Change-Id: I43c3ef8092c6afb6093bd9d80a085a222cc0d062
Linux 3.4.99 > 3.4.100

Change-Id: I1ad56ec31b4e97d4c51eb78da630ad96056a5e9b