| commit | d97370feca2a589dad42154577bb4615a0347852 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@pollux.denx.de> | Tue Oct 24 17:08:31 2006 +0200 |
| committer | Wolfgang Denk <wd@pollux.denx.de> | Tue Oct 24 17:08:31 2006 +0200 |
| tree | 5a3f85d24e07425977b7019017ae1615c0f12ce7 | |
| parent | 9fa48022e5883a0826a98979c0156f6ac5a0ef79 [diff] | |
| parent | 47a6989c10685d2ab3efcf95228ce50d2a496d3e [diff] |
Merge with /home/wd/git/u-boot/master (Conflicts between Jon Loeliger's and Matthew McClintock's tree were resolved by in favour of Jon's version.)