From: Arnd Bergmann <arnd@arndb.de>
Date: Sun, 24 Apr 2016 21:23:53 +0000 (+0200)
Subject: Merge tag 'nomadik-dts-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb12fbd2cc90b22259d8ddd3edc965e2b914f3ff;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'nomadik-dts-v4.7' of git://git./linux/kernel/git/linusw/linux-nomadik into next/dt

Merge "Nomadik DTS changes for v4.7" from Linus Walleij:
- Add accelerometer for NHK15
- Add DMA engine definitions and UART channels

* tag 'nomadik-dts-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: nomadik: add DMA engine and some channels
  ARM: dts: nomadik: add accelerometer IRQ and pin setting
---

bb12fbd2cc90b22259d8ddd3edc965e2b914f3ff