From: Olof Johansson Date: Wed, 12 Dec 2018 22:03:48 +0000 (-0800) Subject: Merge tag 'amlogic-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman... X-Git-Tag: v5.0-rc1~79^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6dc7e8764b0879157899aa9ca15f894e001f0c20;p=thirdparty%2Flinux.git Merge tag 'amlogic-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc soc: Amlogic updates for v4.21 - ARM: meson: Kconfig: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER - misc MAINTAINERS updates * tag 'amlogic-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM: meson: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER MAINTAINERS: add drivers/soc/amlogic/ to amlogic list MAINTAINERS: Remove myself from the list Signed-off-by: Olof Johansson --- 6dc7e8764b0879157899aa9ca15f894e001f0c20