Merge branch 'qcom/soc2' into next/soc
authorOlof Johansson <olof@lixom.net>
Thu, 9 Jan 2014 08:09:16 +0000 (00:09 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 9 Jan 2014 08:09:16 +0000 (00:09 -0800)
* qcom/soc2:
  ARM: msm: Move MSM's DT based hardware to multi-platform support
  ARM: msm: Only build timer.c if required
  ARM: msm: Only build clock.c on proc_comm based platforms

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/Kconfig

Simple merge