diff options
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-20 09:37:09 +0200 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-20 09:37:09 +0200 |
commit | d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96 (patch) | |
tree | 605af42f8834ea0b793e7febe4aba5d899e5f160 /MAINTAINERS | |
parent | fcd69a1a57fb2af4d26201422095a4be9f36963e (diff) | |
parent | 33eac2b3d946fc998a09245dfe54d017079b9056 (diff) | |
download | u-boot-imx-d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96.zip u-boot-imx-d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96.tar.gz u-boot-imx-d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96.tar.bz2 |
Merge branch 'next' of git://git.denx.de/u-boot-avr32
Conflicts:
MAINTAINERS
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 323a3a6..31493c2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -712,7 +712,20 @@ TsiChung Liew <Tsi-Chung.Liew@freescale.com> # Board CPU # ######################################################################### -Haavard Skinnemoen <hskinnemoen@atmel.com> +Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> + + FAVR-32-EZKIT AT32AP7000 + +Mark Jackson <mpfj@mimc.co.uk> + + MIMC200 AT32AP7000 + +Alex Raimondi <alex.raimondi@miromico.ch> +Julien May <julien.may@miromico.ch> + + HAMMERHEAD AT32AP7000 + +Haavard Skinnemoen <haavard.skinnemoen@atmel.com> ATSTK1000 AT32AP7xxx ATSTK1002 AT32AP7000 |