From: Olof Johansson <olof@lixom.net>
Date: Fri, 3 Apr 2015 20:35:11 +0000 (-0700)
Subject: Merge branch 'next/cleanup' into for-next
X-Git-Tag: KARO-TXA5-2015-06-26~151^2~26
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3706c75d0cde00d03d34f2e6e3795f8a0d3d4ce2;p=karo-tx-linux.git

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
---

3706c75d0cde00d03d34f2e6e3795f8a0d3d4ce2
diff --cc MAINTAINERS
index 8ce77a339b56,0f847a931027..796d184181de
--- a/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