commit | c56569b37273e23c5f9576592fa4c5e5f859ed47 | [log] [tgz] |
---|---|---|
author | Olof Johansson <olof@lixom.net> | Thu Jan 02 10:23:58 2014 -0800 |
committer | Olof Johansson <olof@lixom.net> | Thu Jan 02 10:23:58 2014 -0800 |
tree | b6a906c2421511d43aaa4639f6ad16d50b571471 | |
parent | aa1ed457aee209d445dc2ac65c535eb7e232c788 [diff] | |
parent | 47c5a5d6fd5839946c948563573cd9de077a91bb [diff] |
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>