diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-05-24 12:56:53 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-05-24 12:56:53 +0200 |
| commit | 42fd5f87b1613d3039f57e93c16f760a768d3e84 (patch) | |
| tree | 9dd0252fca37dbdb1148ce7fd44dc5c9dd8a6b34 /MAINTAINERS | |
| parent | 2c8d41969b47eb0b973912830c58689b2ba0e50a (diff) | |
| parent | 54694a91428f6c3280fe1ee0923488a1e7e8dbc4 (diff) | |
Merging Stelian Pop AT91 patches
Merge branch 'testing-V2'
Conflicts:
board/atmel/at91cap9adk/Makefile
Fixing copyright
board/atmel/at91sam9260ek/Makefile
Fixing copyright
board/atmel/at91sam9260ek/u-boot.lds
Delete no more needed ld script
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ac7572cfc..1e67b7a16 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -538,6 +538,9 @@ Stelian Pop <stelian.pop@leadtechdesign.com> at91cap9adk ARM926EJS (AT91CAP9 SoC) at91sam9260ek ARM926EJS (AT91SAM9260 SoC) + at91sam9261ek ARM926EJS (AT91SAM9261 SoC) + at91sam9263ek ARM926EJS (AT91SAM9263 SoC) + at91sam9rlek ARM926EJS (AT91SAM9RL SoC) Stefan Roese <sr@denx.de> |