From: Olof Johansson <olof@lixom.net>
Date: Thu, 2 Jan 2014 19:24:50 +0000 (-0800)
Subject: Merge branch 'qcom/boards' into next/boards
X-Git-Tag: Ubuntu-5.2.0-15.16~14161^2~3
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=160c39a2d7fe859354015dda6f0b1fbe069e5228;p=mirror_ubuntu-eoan-kernel.git

Merge branch 'qcom/boards' into next/boards

* qcom/boards:
  ARM: msm_defconfig: Enable restart driver
  defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
  ARM: msm: Add support for APQ8074 Dragonboard
  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>
---

160c39a2d7fe859354015dda6f0b1fbe069e5228