git.ipfire.org Git - thirdparty/linux.git/commitdiff

author	Olof Johansson <olof@lixom.net>
	Wed, 12 Dec 2018 22:03:48 +0000 (14:03 -0800)
committer	Olof Johansson <olof@lixom.net>
	Wed, 12 Dec 2018 22:03:48 +0000 (14:03 -0800)

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 <olof@lixom.net>

		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge