Merge tag 'v4.1-next-arm64' of https://github.com/mbgg/linux-mediatek into next/dt
authorArnd Bergmann <arnd@arndb.de>
Mon, 1 Jun 2015 15:58:53 +0000 (17:58 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 1 Jun 2015 15:58:53 +0000 (17:58 +0200)
Merge "ARM: mediatek: arm64 updates for v4.2" from Matthias Brugger:

- dts: mt8173: fix style convention for pinctrl node
- dts: mt8173: fix indentation for some nodes

* tag 'v4.1-next-arm64' of https://github.com/mbgg/linux-mediatek:
  arm64: dts: mt8173: fix some indentation
  arm64: dts: mt8173: Fixup pinctrl nodes


Trivial merge