Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze

[J-u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 4e2f8a9abb48e63292a2944d86151eac268624d8..1f7735922d6d464476d19dd16419bf8595853829 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -97,6 +97,7 @@ F:    arch/arm/include/asm/imx-common/
 
 ARM MARVELL KIRKWOOD
 M:     Prafulla Wadaskar <[email protected]>
+M:     Luka Perkov <[email protected]>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-marvell.git
 F:     arch/arm/cpu/arm926ejs/kirkwood/
@@ -128,6 +129,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 <[email protected]>
+S:     Maintained
+F:     arch/arm/cpu/armv7/stv0991/
+F:     arch/arm/include/asm/arch-stv0991/
+
 ARM SUNXI
 M:     Ian Campbell <[email protected]>
 M:     Hans De Goede <[email protected]>
@@ -192,10 +199,12 @@ CFI FLASH
 M:     Stefan Roese <[email protected]>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-cfi-flash.git
-F:     drivers/mtd/*
+F:     drivers/mtd/cfi_flash.c
+F:     drivers/mtd/jedec_flash.c
 
 COLDFIRE
-M:     Jason Jin <[email protected]>
+M:     Huan Wang <[email protected]>
+M:     Angelo Dureghello <[email protected]>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-coldfire.git
 F:     arch/m68k/
@@ -310,12 +319,6 @@ S: Maintained
 T:     git git://git.denx.de/u-boot-mpc86xx.git
 F:     arch/powerpc/cpu/mpc86xx/
 
-POWERPC PPC74XX PPC7XX
-M:     Wolfgang Denk <[email protected]>
-S:     Maintained
-T:     git git://git.denx.de/u-boot-74xx-7xx.git
-F:     arch/powerpc/cpu/74xx_7xx/
-
 POWERPC PPC4XX
 M:     Stefan Roese <[email protected]>
 S:     Maintained
@@ -389,6 +392,7 @@ T:  git git://git.denx.de/u-boot-tq-group.git
 
 UBI
 M:     Kyungmin Park <[email protected]>
+M:     Heiko Schocher <[email protected]>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-ubi.git
 F:     drivers/mtd/ubi/