Merge "msm: camera: Fix for suspend resume issue due to shared GPIOs" into msm-3.4