diff options
author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-06-19 15:40:01 +0200 |
---|---|---|
committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-06-19 15:40:01 +0200 |
commit | 448f5fea4c7dd531b69e4e60eed2a72b89b4ed6d (patch) | |
tree | 022599b68a0e72f34f3f152f4a0056b557a06a44 /MAINTAINERS | |
parent | f2134f8e9eb006bdcd729e89f309c07b2fa45180 (diff) | |
parent | 5ffa76a032279bc6d3230b703eda32d13305ba13 (diff) | |
download | u-boot-imx-448f5fea4c7dd531b69e4e60eed2a72b89b4ed6d.zip u-boot-imx-448f5fea4c7dd531b69e4e60eed2a72b89b4ed6d.tar.gz u-boot-imx-448f5fea4c7dd531b69e4e60eed2a72b89b4ed6d.tar.bz2 |
Merge branch 'upstream'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2a43848..2eaef17 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -221,10 +221,11 @@ Jon Loeliger <jdl@freescale.com> MPC8641HPCN MPC8641D -Dan Malek <dan@embeddededge.com> +Dan Malek <dan@embeddedalley.com> - STxGP3 MPC85xx - STxXTc MPC8xx + stxgp3 MPC85xx + stxssa MPC85xx + stxxtc MPC8xx Eran Man <eran@nbase.co.il> @@ -257,15 +258,6 @@ Frank Panno <fpanno@delphintech.com> ep8260 MPC8260 -Peter Pearse <peter.pearse@arm.com> - integratorcp All current ARM supplied & - supported core modules - - see http://www.arm.com - /products/DevTools - /Hardware_Platforms.html - versatile ARM926EJ-S - versatile ARM926EJ-S - Denis Peter <d.peter@mpl.ch> MIP405 PPC4xx @@ -444,6 +436,9 @@ Gary Jennejohn <gj@denx.de> smdk2400 ARM920T trab ARM920T +Konstantin Kletschke <kletschke@synertronixx.de> + scb9328 ARM920T + Nishant Kamat <nskamat@ti.com> omap1610h2 ARM926EJS @@ -461,6 +456,15 @@ Rolf Offermanns <rof@sysgo.de> shannon SA1100 +Peter Pearse <peter.pearse@arm.com> + integratorcp All current ARM supplied & + supported core modules + -see http://www.arm.com + /products/DevTools + /Hardware_Platforms.html + versatile ARM926EJ-S + versatile ARM926EJ-S + Dave Peverley <dpeverley@mpc-data.co.uk> omap730p2 ARM926EJS |