From: Olof Johansson Date: Tue, 25 Sep 2018 18:16:12 +0000 (-0700) Subject: Merge tag 'amlogic-drivers' of https://git.kernel.org/pub/scm/linux/kernel/git/khilma... X-Git-Tag: Ubuntu-5.10.0-12.13~6702^2~19 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bf1da406909b13903873d1f91346f99303fd8cb3;p=mirror_ubuntu-hirsute-kernel.git Merge tag 'amlogic-drivers' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/drivers 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 --- bf1da406909b13903873d1f91346f99303fd8cb3