| commit | e95bcc3661a78ccc094c365ecd2484d00a60f97d | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Sun Mar 16 01:50:18 2008 +0100 |
| committer | Wolfgang Denk <wd@denx.de> | Sun Mar 16 01:50:18 2008 +0100 |
| tree | 0987662fbde9b8792a95ff00023bc22cfbaf2528 | |
| parent | 0b8f2a27861a9fd06eb55a34f855ec9c5102aab4 [diff] | |
| parent | decbe029b2a9d3333d02c433389b1c821eea96d7 [diff] |
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master Conflicts: drivers/rtc/Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>