Merge "ARM: dts: msm: Correct the GPIO numbers"