| commit | e59af4b611408adcdfb5e19bc5194a7d1f8b4dc3 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Mon Apr 07 23:59:10 2008 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Mon Apr 07 23:59:10 2008 +0200 |
| tree | e700a523f54c5ed18bf15f832158f90a31517c85 | |
| parent | 23c5189e6c969255f8c91b30fdf1cf81b698329d [diff] | |
| parent | 70431e8a7393b6b793f77957f95b999fc9a269b8 [diff] |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx Conflicts: lib_ppc/board.c Signed-off-by: Wolfgang Denk <wd@denx.de>