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)
commit19d91c04af478522d2382a3a8edaedef60af57f6
treed35636487588fb021ee58420a623988343aac09a
parent8ed589854a3e3daa030660e7688eb8348e03ffe1
parent962f5143b30568bf67be97365d0616b0050ddaa5
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