Merge branch 'LA.BR.1.2.9_rb1.18' of...

Merge branch 'LA.BR.1.2.9_rb1.18' of https://source.codeaurora.org/quic/la/kernel/msm-3.10 into cm-14.1

 Conflicts:
	drivers/media/platform/msm/camera_v2/msm.c
	drivers/platform/msm/ipa/rmnet_ipa.c
	drivers/platform/msm/qpnp-power-on.c
	fs/f2fs/acl.c