Merge tag 'kbuild-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2decf40d28e1f8131d7f4b65de4639830c492fe9..ce3d04d67c6b01c077f393a7a635edfdff63fbee 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1085,6 +1085,16 @@ F:       drivers/pinctrl/meson/
 F:     drivers/mmc/host/meson*
 N:     meson
 
+ARM/Amlogic Meson SoC CLOCK FRAMEWORK
+M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Jerome Brunet <jbrunet@baylibre.com>
+L:     linux-amlogic@lists.infradead.org
+S:     Maintained
+F:     drivers/clk/meson/
+F:     include/dt-bindings/clock/meson*
+F:     include/dt-bindings/clock/gxbb*
+F:     Documentation/devicetree/bindings/clock/amlogic*
+
 ARM/Annapurna Labs ALPINE ARCHITECTURE
 M:     Tsahee Zidenberg <tsahee@annapurnalabs.com>
 M:     Antoine Tenart <antoine.tenart@free-electrons.com>
@@ -13556,8 +13566,8 @@ F:      include/uapi/linux/virtio_*.h
 F:     drivers/crypto/virtio/
 
 VIRTIO DRIVERS FOR S390
-M:     Christian Borntraeger <borntraeger@de.ibm.com>
 M:     Cornelia Huck <cornelia.huck@de.ibm.com>
+M:     Halil Pasic <pasic@linux.vnet.ibm.com>
 L:     linux-s390@vger.kernel.org
 L:     virtualization@lists.linux-foundation.org
 L:     kvm@vger.kernel.org