Merge branch 'next/cleanup' into for-next

* next/cleanup:
  mmc: Remove msm_sdcc driver
  gpio: Remove gpio-msm-v1 driver
  ARM: Remove mach-msm and associated ARM architecture code

Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
	MAINTAINERS

diff --cc MAINTAINERS
index 8ce77a339b56b9e4872c3d20b52bd314ee3885a3,0f847a9310273598a93f7c3d31ab7add9d17cca1..796d184181de2ff9069fcd6d20ce4dc7092114e8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1333,7 -1301,10 +1317,11 @@@ L:    linux-soc@vger.kernel.or
  S:    Maintained
  F:    arch/arm/mach-qcom/
  F:    drivers/soc/qcom/
 +F:    drivers/firmware/qcom_scm.c
+ F:    drivers/tty/serial/msm_serial.h
+ F:    drivers/tty/serial/msm_serial.c
+ F:    drivers/*/pm8???-*
+ F:    drivers/mfd/ssbi.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
  
  ARM/RADISYS ENP2611 MACHINE SUPPORT

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/Makefile
Simple merge