Merge remote-tracking branch 'u-boot-ti/master'

[karo-tx-uboot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f4625c3f053f371c05ac495f64e653bf831b6852..12fa853cac9f948f4c72903ff016953a8a62cfea 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -214,9 +214,7 @@ Siddarth Gore <gores@marvell.com>
 Paul Gortmaker <paul.gortmaker@windriver.com>
 
        sbc8349         MPC8349
-       sbc8540         MPC8540
        sbc8548         MPC8548
-       sbc8560         MPC8560
        sbc8641d        MPC8641D
 
 Frank Gottschling <fgottschling@eltec.de>
@@ -908,6 +906,10 @@ Michal Simek <monstr@monstr.eu>
 
        zynq            ARM ARMV7 (Zynq SoC)
 
+Lucas Stach <dev@lynxeye.de>
+
+       colibri_t20_iris        Tegra20 (ARM7 & A9 Dual Core)
+
 Nick Thompson <nick.thompson@gefanuc.com>
 
        da830evm        ARM926EJS (DA830/OMAP-L137)