| commit | b8b81a99f72162a7d45fefee21656f81d4c5e323 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Tue May 27 12:56:01 2008 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Tue May 27 12:56:01 2008 +0200 |
| tree | 43a492b3f604adedc0ccc3a6432549681375b64f | |
| parent | eeaaa61e6b0d0e6a0af761074715b4aa5149a46b [diff] | |
| parent | 4e0e8d0df0c965df2eff2f872e6010b607bbf097 [diff] |
Merge branch 'master' of /home/wd/git/u-boot/custodians Conflicts: include/configs/socrates.h Signed-off-by: Wolfgang Denk <wd@denx.de>