]> Pileus Git - ~andy/linux/commitdiff
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)
* 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>

Trivial merge