Merge branch 'qcom/cleanup' into next/drivers

* qcom/cleanup:
  ARM: qcom: Rename various msm prefixed functions to qcom
  clocksource: qcom: split building of legacy vs multiplatform support
  ARM: qcom: Split Qualcomm support into legacy and multiplatform
  clocksource: qcom: Move clocksource code out of mach-msm
  ARM: msm: kill off hotplug.c
  ARM: msm: Remove pen_release usage
  ARM: dts: msm: split out msm8660 and msm8960 soc into dts include

This cleanup branch is a dependency for the following qcom driver changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined MAINTAINERS
index fb08dcececf148165c88179c29f28b39b07532b6,402be6009e26f81487783008df8241cfb4308de2..9dbf7f1898c5bad88b7ca416dc4e20c90fdc2a52
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1167,6 -1167,14 +1167,14 @@@ L:    linux-arm-kernel@lists.infradead.or
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  
+ ARM/QUALCOMM SUPPORT
+ M:    Kumar Gala <galak@codeaurora.org>
+ M:    David Brown <davidb@codeaurora.org>
+ L:    linux-arm-msm@vger.kernel.org
+ S:    Maintained
+ F:    arch/arm/mach-qcom/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
+ 
  ARM/RADISYS ENP2611 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2367,7 -2375,7 +2375,7 @@@ F:      include/linux/cpufreq.
  
  CPU FREQUENCY DRIVERS - ARM BIG LITTLE
  M:    Viresh Kumar <viresh.kumar@linaro.org>
 -M:    Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
 +M:    Sudeep Holla <sudeep.holla@arm.com>
  L:    cpufreq@vger.kernel.org
  L:    linux-pm@vger.kernel.org
  W:    http://www.arm.com/products/processors/technologies/biglittleprocessing.php
@@@ -2857,7 -2865,7 +2865,7 @@@ M:      Jani Nikula <jani.nikula@linux.intel
  L:    intel-gfx@lists.freedesktop.org
  L:    dri-devel@lists.freedesktop.org
  Q:    http://patchwork.freedesktop.org/project/intel-gfx/
 -T:    git git://people.freedesktop.org/~danvet/drm-intel
 +T:    git git://anongit.freedesktop.org/drm-intel
  S:    Supported
  F:    drivers/gpu/drm/i915/
  F:    include/drm/i915*
@@@ -7196,7 -7204,7 +7204,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/rdc/r6040.c
  
  RDS - RELIABLE DATAGRAM SOCKETS
 -M:    Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
 +M:    Chien Yen <chien.yen@oracle.com>
  L:    rds-devel@oss.oracle.com (moderated for non-subscribers)
  S:    Supported
  F:    net/rds/

diff --combined arch/arm/boot/dts/Makefile
index 6d1e43d461871abdb0c94234da68ce21e67492b1,c9eaf1f8704192cd6498006503cb36e109a2d768..3269029a1ce62fdb5193304a7f4a7d158b835634
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -38,7 -38,6 +38,7 @@@ dtb-$(CONFIG_ARCH_AT91) += at91sam9g35e
  dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb
  dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb
  # sama5d3
 +dtb-$(CONFIG_ARCH_AT91)       += at91-sama5d3_xplained.dtb
  dtb-$(CONFIG_ARCH_AT91)       += sama5d31ek.dtb
  dtb-$(CONFIG_ARCH_AT91)       += sama5d33ek.dtb
  dtb-$(CONFIG_ARCH_AT91)       += sama5d34ek.dtb
@@@ -119,9 -118,6 +119,6 @@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
        kirkwood-ts219-6282.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
  dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
- dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
-       qcom-msm8960-cdp.dtb \
-       qcom-apq8074-dragonboard.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
        armada-370-mirabox.dtb \
        armada-370-netgear-rn102.dtb \
@@@ -233,6 -229,9 +230,9 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242
        dra7-evm.dtb
  dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
+ dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \
+       qcom-msm8960-cdp.dtb \
+       qcom-apq8074-dragonboard.dtb
  dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
        ste-hrefprev60-stuib.dtb \
        ste-hrefprev60-tvk.dtb \