Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Wed, 3 Sep 2008 20:55:55 +0000 (22:55 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 3 Sep 2008 20:55:55 +0000 (22:55 +0200)
commit4615fc22e539a2f7dae971701c05f09e21c1ca25
tree21521ea036a6339414051ba8fc37106fbcdcc1d3
parent16116ddd0d0158f4e91c91dc979b845b6e98a99d
parent7deb3b3ecd0e81ef09bb68aa0ec2346f4ae0a405
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>
board/esd/dasa_sim/dasa_sim.c