Merge tag 'v4.6-next-dts64' of https://github.com/mbgg/linux-mediatek into next/dt64
authorArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 20:19:00 +0000 (22:19 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 20:19:00 +0000 (22:19 +0200)
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


Trivial merge