From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 27 Mar 2018 12:32:03 +0000 (+0200)
Subject: Merge tag 'qcom-dts-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=aeb700861aad363ffcd93f98747582c82e286640;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'qcom-dts-for-4.17' of ssh://gitolite./linux/kernel/git/agross/linux into next/dt

Pull "Qualcomm Device Tree Changes for v4.17" from Andy Gross:

* Add initial DTS file for Samsung Galaxy S5
* Fixups for castor touchscreen node
* Fixup QS600 at23 manufacturer
* Add XOADC and IIO to APQ8064

* tag 'qcom-dts-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: dts: msm8974: castor: Fix typo and add startup delay in touchscreen node
  ARM: dts: add XOADC and IIO HWMON to APQ8064
  ARM: dts: use 'atmel' as at24 manufacturer for qcom-apq8064-cm-qs600
  ARM: dts: qcom: Add initial DTS file for Samsung Galaxy S5 phone
---

aeb700861aad363ffcd93f98747582c82e286640