projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a6e2d6 a22d776)
Merge tag 'nomadik-dts-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
authorArnd Bergmann <arnd@arndb.de>
Sun, 24 Apr 2016 21:23:53 +0000 (23:23 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sun, 24 Apr 2016 21:23:53 +0000 (23:23 +0200)
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


Trivial merge