From: Arnd Bergmann Date: Fri, 15 Feb 2019 16:19:19 +0000 (+0100) Subject: Merge tag 'amlogic-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman... X-Git-Tag: v5.1-rc1~156^2~22 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1d03f187f6f9b14852d3b5d7cfe14578e3c0b7cc;p=users%2Fhch%2Fblock.git Merge tag 'amlogic-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/drivers Amlogic: driver updates for v5.1 - clock measure: add support for G12a SoC family - misc. fixes * tag 'amlogic-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: soc: amlogic: clk-measure: add axg and g12a support dt-bindings: amlogic: add new compatible devices to clk_measure soc: amlogic: canvas: Fix meson_canvas_get when probe failed soc: amlogic: add missing of_node_put() Signed-off-by: Arnd Bergmann --- 1d03f187f6f9b14852d3b5d7cfe14578e3c0b7cc