Merge branch 'akpm' (second patch-bomb from Andrew)
[cascardo/linux.git] / MAINTAINERS
index 326dc2d..1f0ef48 100644 (file)
@@ -4045,7 +4045,7 @@ F:        drivers/tty/serial/ucc_uart.c
 FREESCALE SOC SOUND DRIVERS
 M:     Timur Tabi <timur@tabi.org>
 M:     Nicolin Chen <nicoleotsuka@gmail.com>
-M:     Xiubo Li <Li.Xiubo@freescale.com>
+M:     Xiubo Li <Xiubo.Lee@gmail.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained