Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger...

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 22999654195afbabdcf5d05ecae5008abbd062bb..3ac697a64280024b6913011c1627fe1ae4056dcc 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1173,6 +1173,7 @@ M:        Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-mvebu/
+F:     drivers/rtc/armada38x-rtc
 
 ARM/Marvell Berlin SoC support
 M:     Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@ -4433,6 +4434,7 @@ F:        include/linux/hwmon*.h
 HARDWARE RANDOM NUMBER GENERATOR CORE
 M:     Matt Mackall <mpm@selenic.com>
 M:     Herbert Xu <herbert@gondor.apana.org.au>
+L:     linux-crypto@vger.kernel.org
 S:     Odd fixes
 F:     Documentation/hw_random.txt
 F:     drivers/char/hw_random/
@@ -6642,9 +6644,10 @@ F:       include/uapi/linux/netrom.h
 F:     net/netrom/
 
 NETWORK BLOCK DEVICE (NBD)
-M:     Paul Clements <Paul.Clements@steeleye.com>
+M:     Markus Pargmann <mpa@pengutronix.de>
 S:     Maintained
 L:     nbd-general@lists.sourceforge.net
+T:     git git://git.pengutronix.de/git/mpa/linux-nbd.git
 F:     Documentation/blockdev/nbd.txt
 F:     drivers/block/nbd.c
 F:     include/linux/nbd.h
@@ -9725,7 +9728,7 @@ F:        net/tipc/
 
 TILE ARCHITECTURE
 M:     Chris Metcalf <cmetcalf@ezchip.com>
-W:     http://www.tilera.com/scm/
+W:     http://www.ezchip.com/scm/
 S:     Supported
 F:     arch/tile/
 F:     drivers/char/tile-srom.c
@@ -10690,6 +10693,7 @@ F:      drivers/pci/*xen*
 
 XEN BLOCK SUBSYSTEM
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+M:     Roger Pau Monné <roger.pau@citrix.com>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/block/xen-blkback/*