Merge tag 'amlogic-drivers' of https://git.kernel.org/pub/scm/linux/kernel/git/khilma...
authorOlof Johansson <olof@lixom.net>
Tue, 25 Sep 2018 18:16:12 +0000 (11:16 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 25 Sep 2018 18:16:12 +0000 (11:16 -0700)
Amlogic ARM64 driver updates for v4.20
- add meson-canvas driver and bindings
- firmware: Add serial number sysfs entry

* tag 'amlogic-drivers' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  soc: amlogic: add meson-canvas driver
  dt-bindings: soc: amlogic: add meson-canvas documentation
  firmware: meson_sm: Add serial number sysfs entry

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge