Merge branch 'master' of ../master

[u-boot] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0948baba6a32d256c114fafef9c356ccf29d105f..e5ad0cfb5bad04180f4441ff5933633e547d80f2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -555,7 +555,7 @@ Stefano Babic <sbabic@denx.de>
 
 Dirk Behme <dirk.behme@gmail.com>
 
-       omap3_beagle    ARM CORTEX-A8 (OMAP3530 SoC)
+       omap3_beagle    ARM ARMV7 (OMAP3530 SoC)
 
 Eric Benard <eric@eukrea.com>
 
@@ -621,11 +621,11 @@ Kshitij Gupta <kshitij@ti.com>
 
 Vaibhav Hiremath <hvaibhav@ti.com>
 
-       am3517_evm      ARM CORTEX-A8 (AM35x SoC)
+       am3517_evm      ARM ARMV7 (AM35x SoC)
 
 Grazvydas Ignotas <notasas@gmail.com>
 
-       omap3_pandora   ARM CORTEX-A8 (OMAP3xx SoC)
+       omap3_pandora   ARM ARMV7 (OMAP3xx SoC)
 
 Gary Jennejohn <garyj@denx.de>
 
@@ -655,12 +655,12 @@ Nishant Kamat <nskamat@ti.com>
 
 Minkyu Kang <mk7.kang@samsung.com>
 
-       s5p_goni        ARM CORTEX-A8 (S5PC110 SoC)
-       SMDKC100        ARM CORTEX-A8 (S5PC100 SoC)
+       s5p_goni        ARM ARMV7 (S5PC110 SoC)
+       SMDKC100        ARM ARMV7 (S5PC100 SoC)
 
 Frederik Kriewitz <frederik@kriewitz.eu>
 
-       devkit8000      ARM CORTEX-A8 (OMAP3530 SoC)
+       devkit8000      ARM ARMV7 (OMAP3530 SoC)
 
 Sergey Kubushyn <ksi@koi8.net>
 
@@ -685,8 +685,8 @@ Sergey Lapin <slapin@ossfans.org>
 
 Nishanth Menon <nm@ti.com>
 
-       omap3_sdp3430   ARM CORTEX-A8 (OMAP3xx SoC)
-       omap3_zoom1     ARM CORTEX-A8 (OMAP3xx SoC)
+       omap3_sdp3430   ARM ARMV7 (OMAP3xx SoC)
+       omap3_zoom1     ARM ARMV7 (OMAP3xx SoC)
 
 David Müller <d.mueller@elsoft.ch>
 
@@ -724,7 +724,7 @@ Dave Peverley <dpeverley@mpc-data.co.uk>
 
 Manikandan Pillai <mani.pillai@ti.com>
 
-       omap3_evm       ARM CORTEX-A8 (OMAP3xx SoC)
+       omap3_evm       ARM ARMV7 (OMAP3xx SoC)
 
 Stelian Pop <stelian.pop@leadtechdesign.com>
 
@@ -736,7 +736,7 @@ Stelian Pop <stelian.pop@leadtechdesign.com>
 
 Tom Rix <Tom.Rix@windriver.com>
 
-       omap3_zoom2     ARM CORTEX-A8 (OMAP3xx SoC)
+       omap3_zoom2     ARM ARMV7 (OMAP3xx SoC)
 
 John Rigby <jcrigby@gmail.com>
 
@@ -755,7 +755,9 @@ Nomadik Linux Team <STN_WMM_nomadik_linux@list.st.com>
 
 Steve Sakoman <sakoman@gmail.com>
 
-       omap3_overo     ARM CORTEX-A8 (OMAP3xx SoC)
+       omap3_overo     ARM ARMV7 (OMAP3xx SoC)
+       omap4_panda     ARM ARMV7 (OMAP4xx SoC)
+       omap4_sdp4430   ARM ARMV7 (OMAP4xx SoC)
 
 Jens Scharsig <esw@bus-elektronik.de>