Merge tag 'pci-v3.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[jlayton/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5eb2398a7fabbee41ea4863bfb8e3ded3c66ad2e..c411c40d8854557a870b27e34dc24756540b9d3a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6787,7 +6787,7 @@ F:        arch/x86/kernel/quirks.c
 
 PCI DRIVER FOR IMX6
 M:     Richard Zhu <r65037@freescale.com>
-M:     Shawn Guo <shawn.guo@linaro.org>
+M:     Shawn Guo <shawn.guo@freescale.com>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained