From: Olof Johansson <olof@lixom.net>
Date: Thu, 2 Jan 2014 18:23:48 +0000 (-0800)
Subject: Merge branch 'qcom/soc' into next/soc
X-Git-Tag: v3.14-rc1~113^2~12
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=63df151aa1037e4f4e71ec009a3b233ee2cc1dea;p=linux.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 <olof@lixom.net>
---

63df151aa1037e4f4e71ec009a3b233ee2cc1dea