aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 71663f8178ea..349a993fbda6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -918,11 +918,11 @@ F: arch/arm/include/asm/hardware/dec21285.h
918F: arch/arm/mach-footbridge/ 918F: arch/arm/mach-footbridge/
919 919
920ARM/FREESCALE IMX / MXC ARM ARCHITECTURE 920ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
921M: Shawn Guo <shawn.guo@linaro.org> 921M: Shawn Guo <shawn.guo@freescale.com>
922M: Sascha Hauer <kernel@pengutronix.de> 922M: Sascha Hauer <kernel@pengutronix.de>
923L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 923L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
924S: Maintained 924S: Maintained
925T: git git://git.linaro.org/people/shawnguo/linux-2.6.git 925T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
926F: arch/arm/mach-imx/ 926F: arch/arm/mach-imx/
927F: arch/arm/boot/dts/imx* 927F: arch/arm/boot/dts/imx*
928F: arch/arm/configs/imx*_defconfig 928F: arch/arm/configs/imx*_defconfig
@@ -4558,6 +4558,7 @@ M: Greg Rose <gregory.v.rose@intel.com>
4558M: Alex Duyck <alexander.h.duyck@intel.com> 4558M: Alex Duyck <alexander.h.duyck@intel.com>
4559M: John Ronciak <john.ronciak@intel.com> 4559M: John Ronciak <john.ronciak@intel.com>
4560M: Mitch Williams <mitch.a.williams@intel.com> 4560M: Mitch Williams <mitch.a.williams@intel.com>
4561M: Linux NICS <linux.nics@intel.com>
4561L: e1000-devel@lists.sourceforge.net 4562L: e1000-devel@lists.sourceforge.net
4562W: http://www.intel.com/support/feedback.htm 4563W: http://www.intel.com/support/feedback.htm
4563W: http://e1000.sourceforge.net/ 4564W: http://e1000.sourceforge.net/