]> git.sur5r.net Git - u-boot/commit
Fix an ancient CHANGELOG conflict
authorMarkus Klotzbuecher <mk@denx.de>
Mon, 7 May 2007 14:43:56 +0000 (16:43 +0200)
committerMarkus Klotzbuecher <mk@pollux.denx.de>
Mon, 7 May 2007 14:43:56 +0000 (16:43 +0200)
commit3a619dd7bed03e8b4d22a3911f90fd12af5376c2
tree1152a4edd19f33d39a1b7158e24481f0552f95fb
parent6ede0c8b69ad1e6b16463ec75a6dccca152c4b17
Fix an ancient CHANGELOG conflict
CHANGELOG
CHANGELOG-before-U-Boot-1.1.5