Merge branch 'master' of git://www.denx.de/git/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Thu, 27 Dec 2007 00:12:56 +0000 (01:12 +0100)
committerWolfgang 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>
1  2 
MAINTAINERS
MAKEALL
Makefile

diff --cc MAINTAINERS
@@@ -630,10 -630,19 +630,22 @@@ Hayden Fraser <Hayden.Fraser@freescale.
  
  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