| commit | e46a0c354d1e0227bb1269a82417fed05c9f8c34 | [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 | 17cf79a7d196d655b3f6602970135be7a7f05d66 [diff] | |
| parent | bf39adf7427ca5381af6bd6cc20cb2c9f824267a [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>