| commit | d6b082f1f89dc60ee24ae4e99c0714f1849400b5 | [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 | 24e6ce57dd0e656babcd0272da3d2899814b7fc0 [diff] | |
| parent | d2c4f3a949f7a96220f740d70f799c92cc561fd0 [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>