Merge branch 'akpm' (patches from Andrew)

[tomoyo/tomoyo-test1.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 53df756..4b73a79 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9517,6 +9517,12 @@ M:       Stanislaw Gruszka <stf_xl@wp.pl>
 S:     Maintained
 F:     drivers/usb/atm/ueagle-atm.c
 
+IMAGIS TOUCHSCREEN DRIVER
+M:     Markuss Broks <markuss.broks@gmail.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/input/touchscreen/imagis,ist3038c.yaml
+F:     drivers/input/touchscreen/imagis.c
+
 IMGTEC ASCII LCD DRIVER
 M:     Paul Burton <paulburton@kernel.org>
 S:     Maintained
@@ -13653,6 +13659,7 @@ B:      mailto:netdev@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
 F:     Documentation/networking/
+F:     Documentation/process/maintainer-netdev.rst
 F:     include/linux/in.h
 F:     include/linux/net.h
 F:     include/linux/netdevice.h
@@ -14621,6 +14628,12 @@ L:     op-tee@lists.trustedfirmware.org
 S:     Maintained
 F:     drivers/char/hw_random/optee-rng.c
 
+OP-TEE RTC DRIVER
+M:     Clément Léger <clement.leger@bootlin.com>
+L:     linux-rtc@vger.kernel.org
+S:     Maintained
+F:     drivers/rtc/rtc-optee.c
+
 OPA-VNIC DRIVER
 M:     Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
 M:     Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
@@ -20538,14 +20551,15 @@ F:    Documentation/admin-guide/media/zr364xx*
 F:     drivers/media/usb/zr364xx/
 
 USER-MODE LINUX (UML)
-M:     Jeff Dike <jdike@addtoit.com>
 M:     Richard Weinberger <richard@nod.at>
 M:     Anton Ivanov <anton.ivanov@cambridgegreys.com>
+M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-um@lists.infradead.org
 S:     Maintained
 W:     http://user-mode-linux.sourceforge.net
 Q:     https://patchwork.ozlabs.org/project/linux-um/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git next
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git fixes
 F:     Documentation/virt/uml/
 F:     arch/um/
 F:     arch/x86/um/