From: Stefan Roese <sr@denx.de>
Date: Tue, 12 Aug 2008 18:39:27 +0000 (+0200)
Subject: Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9939ffd5fbf1f5aff4d8172531d4fc33797c62c8;p=project%2Fbcm63xx%2Fu-boot.git

Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
---

9939ffd5fbf1f5aff4d8172531d4fc33797c62c8
diff --cc MAINTAINERS
index 58e9aa8c28,777d14186e..7efef6a314
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -416,17 -416,14 +420,17 @@@ Stephen Williams <steve@icarus.com
  
  	JSE		PPC405GPr
  
- John Zhan <zhanz@sinovee.com>
+ Roy Zang <tie-fei.zang@freescale.com>
  
- 	svm_sc8xx	MPC8xx
+ 	mpc7448hpc2	MPC7448
  
- Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ John Zhan <zhanz@sinovee.com>
  
- 	linkstation	MPC8241
+ 	svm_sc8xx	MPC8xx
  
 +Feng Kan <fkan@amcc.com>
 +
 +	redwood			PPC4xx
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards: