| commit | 1f1554841a4c8e069d331176f0c3059fb2bb8280 | [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 | 791e1dba8de76ad8e762a7badb869f224a1f8b82 [diff] | |
| parent | c918261c6d9f265f88baf70f8a73dfe6f0cb9596 [diff] |
Merge branch 'master' of /home/wd/git/u-boot/custodians Conflicts: include/configs/socrates.h Signed-off-by: Wolfgang Denk <wd@denx.de>