]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'msm-fix' into for-next
authorDavid Brown <davidb@codeaurora.org>
Mon, 17 Jun 2013 20:24:51 +0000 (13:24 -0700)
committerDavid Brown <davidb@codeaurora.org>
Mon, 17 Jun 2013 20:24:51 +0000 (13:24 -0700)
commit5f7535199553892cc942f09d22b9c4464ceaac99
tree9c3ed1d5c1ab3ab7d3fd73e0710fff52f676e534
parent9f71c1f2f791fb631f36f62d4afb751b408f2ca5
parent7ba655fc965b073292349fa49fb9d16d701185bc
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
arch/arm/boot/dts/msm8660-surf.dts
arch/arm/boot/dts/msm8960-cdp.dts
drivers/ssbi/ssbi.c