Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git] / MAINTAINERS
index 7d37f8a4743ce5603be79fad77af86e515c400e0..046dad9636e890b9dc86fce7faafcbef3abdecc5 100644 (file)
@@ -1306,7 +1306,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
@@ -1317,6 +1316,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/Amlogic Meson SoC Sound Drivers