diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
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 | |||
918 | F: arch/arm/mach-footbridge/ | 918 | F: arch/arm/mach-footbridge/ |
919 | 919 | ||
920 | ARM/FREESCALE IMX / MXC ARM ARCHITECTURE | 920 | ARM/FREESCALE IMX / MXC ARM ARCHITECTURE |
921 | M: Shawn Guo <shawn.guo@linaro.org> | 921 | M: Shawn Guo <shawn.guo@freescale.com> |
922 | M: Sascha Hauer <kernel@pengutronix.de> | 922 | M: Sascha Hauer <kernel@pengutronix.de> |
923 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 923 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
924 | S: Maintained | 924 | S: Maintained |
925 | T: git git://git.linaro.org/people/shawnguo/linux-2.6.git | 925 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git |
926 | F: arch/arm/mach-imx/ | 926 | F: arch/arm/mach-imx/ |
927 | F: arch/arm/boot/dts/imx* | 927 | F: arch/arm/boot/dts/imx* |
928 | F: arch/arm/configs/imx*_defconfig | 928 | F: arch/arm/configs/imx*_defconfig |
@@ -4558,6 +4558,7 @@ M: Greg Rose <gregory.v.rose@intel.com> | |||
4558 | M: Alex Duyck <alexander.h.duyck@intel.com> | 4558 | M: Alex Duyck <alexander.h.duyck@intel.com> |
4559 | M: John Ronciak <john.ronciak@intel.com> | 4559 | M: John Ronciak <john.ronciak@intel.com> |
4560 | M: Mitch Williams <mitch.a.williams@intel.com> | 4560 | M: Mitch Williams <mitch.a.williams@intel.com> |
4561 | M: Linux NICS <linux.nics@intel.com> | ||
4561 | L: e1000-devel@lists.sourceforge.net | 4562 | L: e1000-devel@lists.sourceforge.net |
4562 | W: http://www.intel.com/support/feedback.htm | 4563 | W: http://www.intel.com/support/feedback.htm |
4563 | W: http://e1000.sourceforge.net/ | 4564 | W: http://e1000.sourceforge.net/ |