diff options
author | Wolfgang Denk <wd@denx.de> | 2010-12-17 01:00:53 +0300 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-12-17 01:00:53 +0300 |
commit | 006915fbb0e3c1c9927fe32c4e92cb011f8499e7 (patch) | |
tree | b477df920f7d638a0472aa1d6bfa5ff71243448c /MAINTAINERS | |
parent | 98e69567022eb2138dd99554b3a2e80522a1b153 (diff) | |
parent | b5d58d8500bfb918c7fec56f241e6ee1078c2be0 (diff) | |
download | u-boot-006915fbb0e3c1c9927fe32c4e92cb011f8499e7.tar.xz |
Merge branch 'master' of ../master into next
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fc6bae9049..ba874362c9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -310,10 +310,11 @@ Tirumala Marri <tmarri@apm.com> bluestone APM821XX -Reinhard Meyer <r.meyer@emk-elektronik.de> +Reinhard Meyer <reinhard.meyer@emk-elektronik.de> TOP860 MPC860T TOP5200 MPC5200 + TOP9000 ARM926EJS (AT91SAM9xxx SoC) Tolunay Orkun <torkun@nextio.com> |