| commit | e9f2dbbb0c0614afd582e386aa16e30b8d64a132 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Fri Feb 15 00:26:52 2008 +0100 |
| committer | Wolfgang Denk <wd@denx.de> | Fri Feb 15 00:26:52 2008 +0100 |
| tree | 1740a361891d2390631ec053f1bc42e524913b78 | |
| parent | fe9628c4de5409414881a4c6bacabc00eb6c2420 [diff] | |
| parent | 29bb2ccf16e80308baa65556b458cdbb76498bff [diff] |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx Conflicts: common/cmd_reginfo.c Signed-off-by: Wolfgang Denk <wd@denx.de>