summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-12-12 14:03:48 -0800
committerOlof Johansson <olof@lixom.net>2018-12-12 14:03:48 -0800
commit6dc7e8764b0879157899aa9ca15f894e001f0c20 (patch)
tree4e8876fecb8fe99abd95216200921042767576c9 /MAINTAINERS
parent4238973b2ecd84412d78cc72c4ab3bdae064f2e8 (diff)
parente9e863dc1dc88212b09d279a143027e1521b35d1 (diff)
downloadlinux-6dc7e8764b0879157899aa9ca15f894e001f0c20.tar.bz2
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 <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0abecc528dac..eb00d8ac7458 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1296,7 +1296,6 @@ F: include/dt-bindings/clock/gxbb*
F: Documentation/devicetree/bindings/clock/amlogic*
ARM/Amlogic Meson SoC support
-M: Carlo Caione <carlo@caione.org>
M: Kevin Hilman <khilman@baylibre.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: linux-amlogic@lists.infradead.org
@@ -1307,6 +1306,7 @@ F: arch/arm/boot/dts/meson*
F: arch/arm64/boot/dts/amlogic/
F: drivers/pinctrl/meson/
F: drivers/mmc/host/meson*
+F: drivers/soc/amlogic/
N: meson
ARM/Annapurna Labs ALPINE ARCHITECTURE