From: Olof Johansson <olof@lixom.net>
Date: Thu, 2 Jan 2014 18:23:58 +0000 (-0800)
Subject: Merge branch 'qcom/dt' into next/dt
X-Git-Tag: v3.14-rc1~112^2~11
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c56569b37273e23c5f9576592fa4c5e5f859ed47;p=linux.git

Merge branch 'qcom/dt' into next/dt

* qcom/dt:
  ARM: dts: MSM8974: Add MMIO architected timer node
  ARM: dts: MSM8974: Add restart node
  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>
---

c56569b37273e23c5f9576592fa4c5e5f859ed47