Merge branch 'qcom/fixes' into next/fixes-non-critical

* qcom/fixes:
  ARM: dts: msm: Fix gpio interrupt and reg length
Signed-off-by: Kevin Hilman <khilman@linaro.org>

arch/arm/boot/dts/qcom-msm8660-surf.dts

@@ -28,11 +28,11 @@ timer@2000000 {
 
 	msmgpio: gpio@800000 {
 		compatible = "qcom,msm-gpio";
-		reg = <0x00800000 0x1000>;
+		reg = <0x00800000 0x4000>;
 		gpio-controller;
 		#gpio-cells = <2>;
 		ngpio = <173>;
-		interrupts = <0 32 0x4>;
+		interrupts = <0 16 0x4>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};

arch/arm/boot/dts/qcom-msm8960-cdp.dts

@@ -31,7 +31,7 @@ msmgpio: gpio@800000 {
 		gpio-controller;
 		#gpio-cells = <2>;
 		ngpio = <150>;
-		interrupts = <0 32 0x4>;
+		interrupts = <0 16 0x4>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 		reg = <0x800000 0x4000>;