Merge tag 'jfs-4.15' of git://github.com/kleikamp/linux-shaggy

[linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 347f2a7..e372994 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2896,6 +2896,13 @@ S:       Supported
 F:     drivers/gpio/gpio-brcmstb.c
 F:     Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
 
+BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
+M:     Al Cooper <alcooperx@gmail.com>
+L:     linux-kernel@vger.kernel.org
+L:     bcm-kernel-feedback-list@broadcom.com
+S:     Maintained
+F:     drivers/phy/broadcom/phy-brcm-usb*
+
 BROADCOM GENET ETHERNET DRIVER
 M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     netdev@vger.kernel.org
@@ -3637,6 +3644,8 @@ F:        drivers/cpufreq/arm_big_little_dt.c
 
 CPU POWER MONITORING SUBSYSTEM
 M:     Thomas Renninger <trenn@suse.com>
+M:     Shuah Khan <shuahkh@osg.samsung.com>
+M:     Shuah Khan <shuah@kernel.org>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
 F:     tools/power/cpupower/
@@ -5475,7 +5484,7 @@ F:        include/uapi/linux/fb.h
 
 FREESCALE CAAM (Cryptographic Acceleration and Assurance Module) DRIVER
 M:     Horia Geantă <horia.geanta@nxp.com>
-M:     Dan Douglass <dan.douglass@nxp.com>
+M:     Aymen Sghaier <aymen.sghaier@nxp.com>
 L:     linux-crypto@vger.kernel.org
 S:     Maintained
 F:     drivers/crypto/caam/
@@ -5655,6 +5664,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git
 S:     Supported
 F:     fs/crypto/
 F:     include/linux/fscrypt*.h
+F:     Documentation/filesystems/fscrypt.rst
 
 FUJITSU FR-V (FRV) PORT
 S:     Orphan
@@ -10060,7 +10070,7 @@ M:      Stephen Boyd <sboyd@codeaurora.org>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
-F:     drivers/base/power/opp/
+F:     drivers/opp/
 F:     include/linux/pm_opp.h
 F:     Documentation/power/opp.txt
 F:     Documentation/devicetree/bindings/opp/
@@ -11051,7 +11061,6 @@ F:      drivers/mtd/nand/pxa3xx_nand.c
 
 QAT DRIVER
 M:     Giovanni Cabiddu <giovanni.cabiddu@intel.com>
-M:     Salvatore Benedetto <salvatore.benedetto@intel.com>
 L:     qat-linux@intel.com
 S:     Supported
 F:     drivers/crypto/qat/
@@ -11784,7 +11793,7 @@ L:      linux-crypto@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained
 F:     drivers/crypto/exynos-rng.c
-F:     Documentation/devicetree/bindings/rng/samsung,exynos-rng4.txt
+F:     Documentation/devicetree/bindings/crypto/samsung,exynos-rng4.txt
 
 SAMSUNG FRAMEBUFFER DRIVER
 M:     Jingoo Han <jingoohan1@gmail.com>