From: Arnd Bergmann Date: Fri, 15 Feb 2019 16:42:31 +0000 (+0100) Subject: Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman... X-Git-Tag: v5.1-rc1~158^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfe9930e9468e6fe871bca9a7db5c9e2ee10f6bb;p=thirdparty%2Flinux.git Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes Amlogic SoC Kconfig updates for v5.1: - arm64: meson: enable g12a clock controller - drop unneeded COMMON_CLK_AMLOGIC * tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: arm64: meson: enable g12a clock controller ARM: meson: remove COMMON_CLK_AMLOGIC selection arm64: meson: remove COMMON_CLK_AMLOGIC selection Signed-off-by: Arnd Bergmann --- cfe9930e9468e6fe871bca9a7db5c9e2ee10f6bb