| commit | 3a619dd7bed03e8b4d22a3911f90fd12af5376c2 | [log] [tgz] |
|---|---|---|
| author | Markus Klotzbuecher <mk@denx.de> | Mon May 07 16:43:56 2007 +0200 |
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | Mon May 07 16:43:56 2007 +0200 |
| tree | 1152a4edd19f33d39a1b7158e24481f0552f95fb | |
| parent | 6ede0c8b69ad1e6b16463ec75a6dccca152c4b17 [diff] |
Fix an ancient CHANGELOG conflict