Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Mon, 7 Apr 2008 21:59:10 +0000 (23:59 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 7 Apr 2008 21:59:10 +0000 (23:59 +0200)
commite59af4b611408adcdfb5e19bc5194a7d1f8b4dc3
treee700a523f54c5ed18bf15f832158f90a31517c85
parent23c5189e6c969255f8c91b30fdf1cf81b698329d
parent70431e8a7393b6b793f77957f95b999fc9a269b8
Merge branch 'master' of git://denx.de/git/u-boot-mpc83xx

Conflicts:

lib_ppc/board.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
lib_ppc/board.c