Stefan Roese f2302d4430 Fix merge problems ...

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

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

..

config.mk

…

cpu.c

…

i2c.c

…

interrupts.c

…

Makefile

…

mmc.c

Fix merge problems

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

pxafb.c

…

serial.c

…

start.S

Minor spelling fix in comment.

2008-07-10 00:49:37 +02:00

usb.c

…