Merge tag 'for_v5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[thirdparty/kernel/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 57f496cff9997358f6626d2207f09cacd2f0e237..0a224ee11249c2211a7b6e3726dfdbe7726127c9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2085,7 +2085,7 @@ F:        drivers/tty/serial/msm_serial.c
 F:     drivers/usb/dwc3/dwc3-qcom.c
 F:     include/dt-bindings/*/qcom*
 F:     include/linux/*/qcom*
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
 
 ARM/RADISYS ENP2611 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
@@ -3121,7 +3121,7 @@ F:        arch/arm/mach-bcm/
 
 BROADCOM BCM2835 ARM ARCHITECTURE
 M:     Eric Anholt <eric@anholt.net>
-M:     Stefan Wahren <stefan.wahren@i2se.com>
+M:     Stefan Wahren <wahrenst@gmx.net>
 L:     linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://github.com/anholt/linux
@@ -8566,7 +8566,7 @@ S:        Odd Fixes
 
 KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
 M:     "J. Bruce Fields" <bfields@fieldses.org>
-M:     Jeff Layton <jlayton@kernel.org>
+M:     Chuck Lever <chuck.lever@oracle.com>
 L:     linux-nfs@vger.kernel.org
 W:     http://nfs.sourceforge.net/
 T:     git git://linux-nfs.org/~bfields/linux.git
@@ -14335,6 +14335,15 @@ S:     Supported
 K:     sifive
 N:     sifive
 
+SIFIVE FU540 SYSTEM-ON-CHIP
+M:     Paul Walmsley <paul.walmsley@sifive.com>
+M:     Palmer Dabbelt <palmer@sifive.com>
+L:     linux-riscv@lists.infradead.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git
+S:     Supported
+K:     fu540
+N:     fu540
+
 SILEAD TOUCHSCREEN DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     linux-input@vger.kernel.org