git.openpandora.org / pandora-u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69e2c6d d5996dd)
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
authorStefan Roese <sr@denx.de>
Mon, 14 Jul 2008 08:45:47 +0000 (10:45 +0200)
committerStefan Roese <sr@denx.de>
Mon, 14 Jul 2008 08:45:47 +0000 (10:45 +0200)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
MAKEALL patch | diff1 | diff2 | blob | history
board/sandburst/metrobox/metrobox.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
index a4637fd,1f29abb..b667c8e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -418,11 -417,8 +417,11 @@@ John Zhan <zhanz@sinovee.com
  
  Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  
-       linkstation             MPC8241
+       linkstation     MPC8241
  
 +Feng Kan <fkan@amcc.com>
 +
 +      redwood                 PPC4xx
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
diff --cc MAKEALL
Simple merge
diff --cc board/sandburst/metrobox/metrobox.c
Simple merge
Pandora U-Boot Repository