Stefan Roese f2302d4430 Fix merge problems ...

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

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

..

config.mk

fix pxa255_idp board

2007-10-23 16:40:40 +02:00

cpu.c

GCC-4.x fixes: clean up global data pointer initialization for all boards.

2006-03-31 18:32:53 +02:00

i2c.c

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

interrupts.c

ARM: cleanup duplicated exception handlingcode

2008-02-14 09:38:21 +00:00

Makefile

Merge with /home/wd/git/u-boot/master

2006-11-27 16:13:00 +01:00

mmc.c

Fix merge problems

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

pxafb.c

* Clean up tools/bmp_logo.c to not add trailing white space

2004-10-09 23:25:58 +00:00

serial.c

fix pxa255_idp board

2007-10-23 16:40:40 +02:00

start.S

Minor spelling fix in comment.

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

usb.c

PXA USB OHCI: "usb stop" implementation.

2007-10-31 10:07:47 +01:00