From: Stefan Roese <sr@denx.de>
Date: Mon, 14 Jul 2008 08:45:47 +0000 (+0200)
Subject: Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
X-Git-Tag: v2008.10-rc1~194
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4b326101d6cfaeab8250988bc4c7f51e6c92d719;p=u-boot

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

4b326101d6cfaeab8250988bc4c7f51e6c92d719
diff --cc MAINTAINERS
index a4637fdf1e,1f29abb3c7..b667c8e594
--- a/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: