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)
commit810265812aca72a034111c3ada73cc1caa0d6990
treea97ff14ef96fc1fde4ef49a43187688f64932859
parent63cb275e6e7a023f4e25d227a875f06563c9d7e9
parente881ad1bc6e46fc933fef77cfe587625e30478e9
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