tree d473e5c2d3e24d340179dd0a8990c61928060901
parent e29c64865f6c7eeb98f7c6e2371f1100101f7562
parent 7dac24bdc1dd561573cd8ce534a63dc975f51ca8
author Olof Johansson <olof@lixom.net> 1413751148 -0700
committer Olof Johansson <olof@lixom.net> 1413751148 -0700

Merge tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into fixes

Merge "qcom DT changes for v3.18-3" from Kumar Gala:

Qualcomm ARM Based Device Tree Updates for v3.18-3

* Added Board support for CM-QS600 and Sony Xperia Z1 phone
* Added SATA support on IPQ8064/AP148

* tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: dts: qcom: add CM-QS600 board
  ARM: dts: qcom: Add initial DTS file for Sony Xperia Z1 phone
  ARM: dts: qcom: Add SATA support on IPQ8064/AP148