| commit | 0d0d3487fbdedad972099884099c091df7d37fd5 | [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 | 0d993a9091ca9238575684514641872861f38b44 [diff] | |
| parent | 8bd4dff493ba02bb5294044f1d6ddf37517a960e [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>