From: Wolfgang Denk <wd@denx.de>
Date: Wed, 3 Sep 2008 20:55:55 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
X-Git-Tag: v2008.10-rc1~61^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4615fc22e539a2f7dae971701c05f09e21c1ca25;p=u-boot

Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

Conflicts:

	board/esd/dasa_sim/dasa_sim.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

4615fc22e539a2f7dae971701c05f09e21c1ca25