diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2012-12-10 13:44:41 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2012-12-10 14:13:27 +0900 |
| commit | 2c601c7208713ba9b2158c57adcf515f4bdbc212 (patch) | |
| tree | 9f6e70f33565beceb956b98c261bee19731d50d2 /MAINTAINERS | |
| parent | b8a7c467960ffb4d5a5e1eef5f7783fb6f594542 (diff) | |
| parent | fd4d564b3c80b111f18c93adb14233a6a7ddb0e9 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot into resolve
Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e34d9f3ec36..36b47b741ad 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7,6 +7,10 @@ # and Cc: the <u-boot@lists.denx.de> mailing list. # # # # Note: lists sorted by Maintainer Name # +# Note: These are the maintainers for specific *boards*. The # +# custodians for general architectures and subsystems can # +# be found here -- http://www.denx.de/wiki/U-Boot/Custodians # +# # ######################################################################### @@ -388,6 +392,8 @@ Ricardo Ribalda <ricardo.ribalda@uam.es> Stefan Roese <sr@denx.de> + a3m071 MPC5200 + P3M7448 MPC7448 uc100 MPC857 @@ -800,7 +806,7 @@ Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> apx4devkit i.MX28 -Luka Perkov <uboot@lukaperkov.net> +Luka Perkov <luka@openwrt.org> ib62x0 ARM926EJS iconnect ARM926EJS |