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 debe74cde67b280eb4eb063733639a2a03a1b1e9..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/