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)
commite37fce7346dcc4ab1a3f6be675c901efc3af6964
tree9fa125259d370e52bee6f684e4932e526997eb05
parent51f37801b44fb5beb7f651e6f74e0dd90fd159c9
parent4f2041174d62d21ec46db48809a29d6517f6d006
Merge branch 'qcom/soc2' into next/soc

* 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>
arch/arm/Kconfig