From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 10 May 2016 20:19:00 +0000 (+0200)
Subject: Merge tag 'v4.6-next-dts64' of https://github.com/mbgg/linux-mediatek into next/dt64
X-Git-Tag: v4.7-rc1~135^2~1
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/19d91c04af478522d2382a3a8edaedef60af57f6

Merge tag 'v4.6-next-dts64' of https://github.com/mbgg/linux-mediatek into next/dt64

Merge "ARM: mediatek: dts64 updates for v4.7" from Matthias Brugger:

- add thermal and auxadc device nodes to mt8173
- add thermal zone nodes to mt8173

* tag 'v4.6-next-dts64' of https://github.com/mbgg/linux-mediatek:
  arm64: dts: mt8173: Add thermal zone node.
  ARM64: dts: mt8173: Add thermal/auxadc device nodes
---

19d91c04af478522d2382a3a8edaedef60af57f6