| commit | 9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105 | [log] [tgz] |
|---|---|---|
| author | Stefan Roese <sr@denx.de> | Tue Dec 11 11:34:54 2007 +0100 |
| committer | Stefan Roese <sr@denx.de> | Tue Dec 11 11:34:54 2007 +0100 |
| tree | 1afcc9c20c04e19870ab5e2996104877695c54a3 | |
| parent | 7cfc12a7dcfdb350e2ab76db4dafcc30f7e77c2b [diff] | |
| parent | 41be969f4957115ed7b1fe8b890bfaee99d7a7a2 [diff] |
Merge commit 'u-boot/master' into for-1.3.1 Conflicts: drivers/rtc/Makefile