F:     drivers/mtd/jedec_flash.c
 
 COLDFIRE
-M:     Huan Wang <alison.wang@freescale.com>
+M:     Huan Wang <alison.wang@nxp.com>
 M:     Angelo Dureghello <angelo@sysam.it>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-coldfire.git
 
 BSC9131RDB BOARD
-M:     Poonam Aggrwal <poonam.aggrwal@freescale.com>
+M:     Poonam Aggrwal <poonam.aggrwal@nxp.com>
 S:     Maintained
 F:     board/freescale/bsc9131rdb/
 F:     include/configs/BSC9131RDB.h
 
 BSC9132QDS BOARD
-M:     Naveen Burmi <NaveenBurmi@freescale.com>
+M:     Naveen Burmi <naveen.burmi@nxp.com>
 S:     Maintained
 F:     board/freescale/bsc9132qds/
 F:     include/configs/BSC9132QDS.h
 
 C29XPCIE BOARD
-M:     Po Liu <po.liu@freescale.com>
+M:     Po Liu <po.liu@nxp.com>
 S:     Maintained
 F:     board/freescale/c29xpcie/
 F:     include/configs/C29XPCIE.h
 
 LS1021AQDS BOARD
-M:     Alison Wang <alison.wang@freescale.com>
+M:     Alison Wang <alison.wang@nxp.com>
 S:     Maintained
 F:     board/freescale/ls1021aqds/
 F:     include/configs/ls1021aqds.h
 
 LS1021ATWR BOARD
-M:     Alison Wang <alison.wang@freescale.com>
+M:     Alison Wang <alison.wang@nxp.com>
 S:     Maintained
 F:     board/freescale/ls1021atwr/
 F:     include/configs/ls1021atwr.h
 
 LS1043AQDS BOARD
-M:     Mingkai Hu <Mingkai.Hu@freescale.com>
+M:     Mingkai Hu <mingkai.hu@nxp.com>
 S:     Maintained
 F:     board/freescale/ls1043aqds/
 F:     include/configs/ls1043aqds.h
 
 LS1043A BOARD
-M:     Mingkai Hu <Mingkai.hu@freescale.com>
+M:     Mingkai Hu <mingkai.hu@nxp.com>
 S:     Maintained
 F:     board/freescale/ls1043ardb/
 F:     board/freescale/ls1043ardb/ls1043ardb.c
 
 M52277EVB BOARD
-M:     TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M:     TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:     Maintained
 F:     board/freescale/m52277evb/
 F:     include/configs/M52277EVB.h
 
 M5235EVB BOARD
-M:     TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M:     TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:     Maintained
 F:     board/freescale/m5235evb/
 F:     include/configs/M5235EVB.h
 
 M5253DEMO BOARD
-M:     TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M:     TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:     Maintained
 F:     board/freescale/m5253demo/
 F:     include/configs/M5253DEMO.h
 
 M53017EVB BOARD
-M:     TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M:     TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:     Maintained
 F:     board/freescale/m53017evb/
 F:     include/configs/M53017EVB.h
 
 M5329EVB BOARD
-M:     TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M:     TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:     Maintained
 F:     board/freescale/m5329evb/
 F:     include/configs/M5329EVB.h
 
 M5373EVB BOARD
-M:     TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M:     TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:     Maintained
 F:     board/freescale/m5373evb/
 F:     include/configs/M5373EVB.h
 
 M54455EVB BOARD
-M:     TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M:     TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:     Maintained
 F:     board/freescale/m54455evb/
 F:     include/configs/M54455EVB.h
 
 M547XEVB BOARD
-M:     TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M:     TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:     Maintained
 F:     board/freescale/m547xevb/
 F:     include/configs/M5475EVB.h
 
 M548XEVB BOARD
-M:     TsiChung Liew <Tsi-Chung.Liew@freescale.com>
+M:     TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:     Maintained
 F:     board/freescale/m548xevb/
 F:     include/configs/M5485EVB.h
 
 MX53EVK BOARD
-M:     Jason Liu <r64343@freescale.com>
+M:     Jason Liu <jason.hui.liu@nxp.com>
 S:     Maintained
 F:     board/freescale/mx53evk/
 F:     include/configs/mx53evk.h
 
 MX53LOCO BOARD
-M:     Jason Liu <r64343@freescale.com>
+M:     Jason Liu <jason.hui.liu@nxp.com>
 S:     Maintained
 F:     board/freescale/mx53loco/
 F:     include/configs/mx53loco.h
 
 T1040QDS BOARD
-M:     Poonam Aggrwal <poonam.aggrwal@freescale.com>
+M:     Poonam Aggrwal <poonam.aggrwal@nxp.com>
 S:     Maintained
 F:     board/freescale/t1040qds/
 F:     include/configs/T1040QDS.h
 
 VF610TWR BOARD
-M:     Alison Wang <b18965@freescale.com>
+M:     Alison Wang <alison.wang@nxp.com>
 S:     Maintained
 F:     board/freescale/vf610twr/
 F:     include/configs/vf610twr.h