From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 1 Jun 2015 15:58:53 +0000 (+0200)
Subject: Merge tag 'v4.1-next-arm64' of https://github.com/mbgg/linux-mediatek into next/dt
X-Git-Tag: v4.2-rc1~99^2~18
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=810265812aca72a034111c3ada73cc1caa0d6990;p=linux.git

Merge tag 'v4.1-next-arm64' of https://github.com/mbgg/linux-mediatek into next/dt

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
---

810265812aca72a034111c3ada73cc1caa0d6990