Stefan Roese f2302d4430 Fix merge problems ...

Signed-off-by: Stefan Roese <sr@denx.de>

2008-08-06 14:05:38 +02:00

..

crt0.S

…

demo.c

Fix merge problems

2008-08-06 14:05:38 +02:00

glue.c

…

glue.h

…

libgenwrap.c

…

Makefile

…