| commit | 014c595f12d4f7e14cb10188f856465b2d41718f | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Mon Mar 09 00:41:48 2009 +0100 |
| committer | Wolfgang Denk <wd@denx.de> | Mon Mar 09 00:41:48 2009 +0100 |
| tree | 9130a01fbb5499975530a20a559dbaba9a1f2a89 | |
| parent | 9c2d63ec0e9520948b6d598ea32e9aa4e0de847f [diff] | |
| parent | f70fd13e2fe4cf58e251271c27f9c06e141d7f9a [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx Conflicts: lib_ppc/board.c Signed-off-by: Wolfgang Denk <wd@denx.de>