Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0cf26025359d93aa19401ad43688bdd49288880a..eef70d0f681770eabbffb77bf8b8cf0ef36b81b1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -76,9 +76,7 @@ ARM ATMEL AT91
 M:     Andreas Bießmann <andreas.devel@googlemail.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-atmel.git
-F:     arch/arm/cpu/armv7/at91/
-F:     arch/arm/cpu/at91-common/
-F:     arch/arm/include/asm/arch-at91/
+F:     arch/arm/mach-at91/
 
 ARM FREESCALE IMX
 M:     Stefano Babic <sbabic@denx.de>
@@ -97,10 +95,10 @@ F:  arch/arm/include/asm/imx-common/
 
 ARM MARVELL KIRKWOOD
 M:     Prafulla Wadaskar <prafulla@marvell.com>
+M:     Luka Perkov <luka.perkov@sartura.hr>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-marvell.git
-F:     arch/arm/cpu/arm926ejs/kirkwood/
-F:     arch/arm/include/asm/arch-kirkwood/
+F:     arch/arm/mach-kirkwood/
 
 ARM MARVELL PXA
 M:     Marek Vasut <marex@denx.de>
@@ -128,6 +126,12 @@ T: git git://git.denx.de/u-boot-stm.git
 F:     arch/arm/cpu/arm926ejs/spear/
 F:     arch/arm/include/asm/arch-spear/
 
+ARM STM STV0991
+M:     Vikas Manocha <vikas.manocha@st.com>
+S:     Maintained
+F:     arch/arm/cpu/armv7/stv0991/
+F:     arch/arm/include/asm/arch-stv0991/
+
 ARM SUNXI
 M:     Ian Campbell <ijc@hellion.org.uk>
 M:     Hans De Goede <hdegoede@redhat.com>
@@ -140,9 +144,7 @@ ARM TEGRA
 M:     Tom Warren <twarren@nvidia.com>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-tegra.git
-F:     arch/arm/cpu/arm720t/tegra*/
-F:     arch/arm/cpu/armv7/tegra*/
-F:     arch/arm/cpu/tegra*/
+F:     arch/arm/mach-tegra/
 F:     arch/arm/include/asm/arch-tegra*/
 
 ARM TI
@@ -163,7 +165,7 @@ T:  git git://git.denx.de/u-boot-uniphier.git
 F:     arch/arm/cpu/armv7/uniphier/
 F:     arch/arm/include/asm/arch-uniphier/
 F:     configs/ph1_*_defconfig
-F:     drivers/serial/serial_uniphier.c
+N:     uniphier
 
 ARM ZYNQ
 M:     Michal Simek <monstr@monstr.eu>
@@ -312,12 +314,6 @@ S: Maintained
 T:     git git://git.denx.de/u-boot-mpc86xx.git
 F:     arch/powerpc/cpu/mpc86xx/
 
-POWERPC PPC74XX PPC7XX
-M:     Wolfgang Denk <wd@denx.de>
-S:     Maintained
-T:     git git://git.denx.de/u-boot-74xx-7xx.git
-F:     arch/powerpc/cpu/74xx_7xx/
-
 POWERPC PPC4XX
 M:     Stefan Roese <sr@denx.de>
 S:     Maintained