]> git.sur5r.net Git - u-boot/commit
projects / u-boot / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4785a69) | patch
trivial: fix consequences of a bad merge
authorGuennadi Liakhovetski <lg@denx.de>
Wed, 9 Jan 2008 00:15:25 +0000 (01:15 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Jan 2008 21:27:09 +0000 (22:27 +0100)
commit7ca90513486abd4ae50bd1b7403f47cc58c5ad25
tree4385ab736a14e635729160fc311e24b341b8a587tree | snapshot
parent4785a694c0045996ccf0ac5b8edf531efc1b730ecommit | diff
trivial: fix consequences of a bad merge

Fix what looks like a merge artifact.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
include/configs/M54455EVB.h diff | blob | history
Cloned from git://git.denx.de/u-boot.git