Merge branch 'qcom/soc' into next/soc

Browse source

* 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>

...

This commit is contained in:

Olof Johansson 2014-01-02 10:23:48 -08:00

parent dd7d395883 17d0900c95

commit 63df151aa1

3 changed files with 52 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

33

arch/arm/boot/dts/qcom-msm8974.dtsi

View file

15

arch/arm/mach-msm/Kconfig

View file

12

arch/arm/mach-msm/board-trout.c

View file