From: Olof Johansson Date: Thu, 2 Jan 2014 18:23:48 +0000 (-0800) Subject: Merge branch 'qcom/soc' into next/soc X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=63df151aa1037e4f4e71ec009a3b233ee2cc1dea;p=linux-beck.git Merge branch 'qcom/soc' into next/soc * qcom/soc: ARM: msm: Simplify ARCH_MSM_DT config ARM: msm: Add support for MSM8974 SoC ARM: msm: trout: fix uninit var warning Signed-off-by: Olof Johansson --- 63df151aa1037e4f4e71ec009a3b233ee2cc1dea