Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorArnd Bergmann <arnd@arndb.de>
Fri, 4 Aug 2017 10:50:52 +0000 (12:50 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 4 Aug 2017 10:50:52 +0000 (12:50 +0200)
Pull "Amlogic fixes for v4.13-rc" from Kevin Hilman:

- 2 minor DT fixes

* tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: dts: meson-gxl-s905x-libretech-cc: fixup board definition
  ARM64: dts: meson-gx: use specific compatible for the AO pwms


Trivial merge