Merge branch 'qcom/soc' into next/soc
authorOlof Johansson <olof@lixom.net>
Thu, 2 Jan 2014 18:23:48 +0000 (10:23 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 2 Jan 2014 18:23:48 +0000 (10:23 -0800)
commit63df151aa1037e4f4e71ec009a3b233ee2cc1dea
treea886c62b097a88b3ff3fc2a394177a861b373c1a
parentdd7d395883adce2e623e4ef0af7598e6987685d9
parent17d0900c95622c0bb672bbd7115ae228cfc3cd21
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>