Merge tag 'msm-cleanup-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Sat, 15 Jun 2013 01:26:26 +0000 (18:26 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 15 Jun 2013 01:28:02 +0000 (18:28 -0700)
commite45600107b6700237f22f2d1d853bd49d8168f68
tree078d1d011e9e197b3758ba22b7e11621fccab13f
parentbae994b1990d55931c420c3c82fcd073b1529f89
parent1aa3d1a3c7d235c47e30c7c8c6b5ef02fb1536b3
Merge tag 'msm-cleanup-for-3.11' of git://git./linux/kernel/git/davidb/linux-msm into next/cleanup

From David Brown:
Cleanups for MSM for 3.11

These are a handful of cleanups to the MSM tree.  The gpio cleanups
get us closer to having proper pinmux and gpio support.

* tag 'msm-cleanup-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  mfd: ssbi: Use devm_* and simplify code
  gpio: msm: Add device tree and irqdomain support for gpio-msm-v2
  ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs
  msm: iomap: Remove unused bases and mappings
  msm: Remove unused file core.h
  ARM: msm: Remove init_irq declaration in machine description

Signed-off-by: Olof Johansson <olof@lixom.net>
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/gpio/Kconfig
drivers/ssbi/ssbi.c