Merge branch 'acpi-cppc'

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ee9cc2b40409ea90bf9b483df91e3690b82a3f68..ebf03f5f0619a662bfca89f6457ae98375fb660d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8746,10 +8746,9 @@ S:       Orphan
 F:     drivers/usb/gadget/udc/fsl*
 
 FREESCALE USB PHY DRIVER
-M:     Ran Wang <ran.wang_1@nxp.com>
 L:     linux-usb@vger.kernel.org
 L:     linuxppc-dev@lists.ozlabs.org
-S:     Maintained
+S:     Orphan
 F:     drivers/usb/phy/phy-fsl-usb*
 
 FREEVXFS FILESYSTEM
@@ -11995,7 +11994,7 @@ F:      include/keys/encrypted-type.h
 F:     security/keys/encrypted-keys/
 
 KEYS-TRUSTED
-M:     James Bottomley <jejb@linux.ibm.com>
+M:     James Bottomley <James.Bottomley@HansenPartnership.com>
 M:     Jarkko Sakkinen <jarkko@kernel.org>
 M:     Mimi Zohar <zohar@linux.ibm.com>
 L:     linux-integrity@vger.kernel.org
@@ -14357,7 +14356,7 @@ F:      drivers/dma/at_xdmac.c
 F:     include/dt-bindings/dma/at91.h
 
 MICROCHIP AT91 SERIAL DRIVER
-M:     Richard Genoud <richard.genoud@gmail.com>
+M:     Richard Genoud <richard.genoud@bootlin.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
 F:     drivers/tty/serial/atmel_serial.c
@@ -19669,7 +19668,7 @@ F:      drivers/scsi/sg.c
 F:     include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:     "James E.J. Bottomley" <jejb@linux.ibm.com>
+M:     "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 M:     "Martin K. Petersen" <martin.petersen@oracle.com>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained