Stefan Roese f2302d4430 Fix merge problems ...

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

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

..

fpu

…

andi.c

…

asm.S

…

b.c

Fix merge problems

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

cmp.c

Fix merge problems

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

cmpi.c

Fix merge problems

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

complex.c

Fix merge problems

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

cpu_asm.h

…

cpu.c

…

cr.c

Fix merge problems

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

load.c

Fix merge problems

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

Makefile

…

multi.c

Fix merge problems

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

rlwimi.c

…

rlwinm.c

…

rlwnm.c

…

srawi.c

…

store.c

Fix merge problems

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

string.c

Fix merge problems

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

three.c

…

threei.c

…

threex.c

…

two.c

…

twox.c

…