author | Wolfgang Denk <wd@denx.de> | |
Thu, 27 Dec 2007 00:12:56 +0000 (01:12 +0100) | ||
committer | Wolfgang Denk <wd@denx.de> | |
Thu, 27 Dec 2007 00:12:56 +0000 (01:12 +0100) |
Conflicts:
MAINTAINERS
Signed-off-by: Wolfgang Denk <wd@denx.de>
MAINTAINERS
Signed-off-by: Wolfgang Denk <wd@denx.de>
1 | 2 | |||
---|---|---|---|---|
MAINTAINERS | patch | | diff1 | | diff2 | | blob | history |
MAKEALL | patch | | diff1 | | diff2 | | blob | history |
Makefile | patch | | diff1 | | diff2 | | blob | history |
diff --cc MAINTAINERS
index ccf4d352d4726e66efd88e3bef02e30e1e8b84ad,ec5e400ffc49e3ab3029708c5416753a0c46ddf8..5c68e5d74dca1d0dfe95ef485fd5683080f7e9a9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
Haavard Skinnemoen <hskinnemoen@atmel.com>
- ATSTK1000 AT32AP7000
+ ATSTK1000 AT32AP7xxx
+ ATSTK1002 AT32AP7000
+ ATSTK1003 AT32AP7001
+ ATSTK1004 AT32AP7002
+
+ #########################################################################
+ # SuperH Systems: #
+ # #
+ # Maintainer Name, Email Address #
+ # Board CPU #
+ #########################################################################
+
+ Nobuhiro Iwmaatsu <iwamatsu@nigauri.org>
+
+ MS7750SE SH7750
+ MS7722SE SH7722
#########################################################################
# End of MAINTAINERS list #
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge