Merge branch 'msm-fix' into for-next

* msm-fix:
  gpio: msm-v1: Remove errant __devinit to fix compile
  mfd: ssbi: Add MODULE_DEVICE_TABLE
  ARM: dts: msm: Fix bad register addresses
  arch: arm: mach-msm: using strlcpy instead of strncpy

Conflicts:
	arch/arm/boot/dts/msm8660-surf.dts
	arch/arm/boot/dts/msm8960-cdp.dts

diff --cc arch/arm/boot/dts/msm8660-surf.dts
index 8931906b9263a309534f12a564ffb254ad3eed9a,d347082d28f3a1a541297bd5c2c36b6d083adfe7..cdc010e0f93edcd330be85f74bda223951d6eaae
--- 1/arch/arm/boot/dts/msm8660-surf.dts
--- 2/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@@ -26,18 -26,7 +26,18 @@@
                cpu-offset = <0x40000>;
        };
  
-       serial@19c400000 {
 +      msmgpio: gpio@800000 {
 +              compatible = "qcom,msm-gpio";
 +              reg = <0x00800000 0x1000>;
 +              gpio-controller;
 +              #gpio-cells = <2>;
 +              ngpio = <173>;
 +              interrupts = <0 32 0x4>;
 +              interrupt-controller;
 +              #interrupt-cells = <2>;
 +      };
 +
+       serial@19c40000 {
                compatible = "qcom,msm-hsuart", "qcom,msm-uart";
                reg = <0x19c40000 0x1000>,
                      <0x19c00000 0x1000>;

diff --cc arch/arm/boot/dts/msm8960-cdp.dts
index 52fe25328883bc9c0e1967a01006a30315b32da0,7c9ef9b80c159afa8f2de2b6ea31d157d7c64642..db2060c465404d81faab3cd8d2c8427588c1354f
--- 1/arch/arm/boot/dts/msm8960-cdp.dts
--- 2/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@@ -26,18 -26,7 +26,18 @@@
                cpu-offset = <0x80000>;
        };
  
-       serial@19c400000 {
 +      msmgpio: gpio@fd510000 {
 +              compatible = "qcom,msm-gpio";
 +              gpio-controller;
 +              #gpio-cells = <2>;
 +              ngpio = <150>;
 +              interrupts = <0 32 0x4>;
 +              interrupt-controller;
 +              #interrupt-cells = <2>;
 +              reg = <0xfd510000 0x4000>;
 +      };
 +
+       serial@16440000 {
                compatible = "qcom,msm-hsuart", "qcom,msm-uart";
                reg = <0x16440000 0x1000>,
                      <0x16400000 0x1000>;

diff --cc drivers/ssbi/ssbi.c
Simple merge