This series is based on David Brown's for-next branch git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-next The previous gpio patches left some room for consolidation and required a few fixes. This patch provides the necessary patches to do that. Rohit Vaswani (3): ARM: msm: dts: Fix the gpio register address for msm8960 drivers: gpio: msm: Fix the error condition for reading ngpio ARM: msm: Consolidate gpiomux for older architectures arch/arm/boot/dts/msm8960-cdp.dts | 4 ++-- arch/arm/mach-msm/Kconfig | 3 +-- arch/arm/mach-msm/gpiomux-v1.c | 33 --------------------------------- arch/arm/mach-msm/gpiomux.h | 10 ---------- drivers/gpio/gpio-msm-v2.c | 2 +- 5 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 arch/arm/mach-msm/gpiomux-v1.c -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html