From: Olof Johansson Date: Thu, 9 Jan 2014 08:09:16 +0000 (-0800) Subject: Merge branch 'qcom/soc2' into next/soc X-Git-Tag: v3.14-rc1~113^2~6 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e37fce7346dcc4ab1a3f6be675c901efc3af6964;p=linux.git 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 --- e37fce7346dcc4ab1a3f6be675c901efc3af6964