Merge branch 'qcom/boards' into next/boards
authorOlof Johansson <olof@lixom.net>
Thu, 2 Jan 2014 19:24:50 +0000 (11:24 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 2 Jan 2014 19:24:50 +0000 (11:24 -0800)
commit160c39a2d7fe859354015dda6f0b1fbe069e5228
tree35e5be333414ea88ff75c1312de8aa83ea8cc3e6
parent8708138951b08441f4e18e75a2d012750261f0c0
parent21dea66951342ec514ad498eda843cf633a13634
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>
arch/arm/boot/dts/Makefile